rpms/kernel/devel linux-2.6.11-xen.patch, 1.11, 1.12 linux-2.6.9-xen-compile.patch, 1.37, 1.38

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Apr 25 14:38:35 UTC 2005


Author: riel

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9302

Modified Files:
	linux-2.6.11-xen.patch linux-2.6.9-xen-compile.patch 
Log Message:
it applies!  quick, commit it before davej changes stuff again

linux-2.6.11-xen.patch:
 arch/xen/Kconfig                                      |  190 +
 arch/xen/Kconfig.drivers                              |   57 
 arch/xen/Makefile                                     |   70 
 arch/xen/boot/Makefile                                |    8 
 arch/xen/configs/xen0_defconfig_x86_32                | 1113 +++++++++++
 arch/xen/configs/xen0_defconfig_x86_64                |  995 ++++++++++
 arch/xen/configs/xenU_defconfig_x86_32                |  533 +++++
 arch/xen/configs/xenU_defconfig_x86_64                |  514 +++++
 arch/xen/i386/Kconfig                                 |  975 ++++++++++
 arch/xen/i386/Makefile                                |  102 +
 arch/xen/i386/kernel/Makefile                         |   91 
 arch/xen/i386/kernel/cpu/Makefile                     |   31 
 arch/xen/i386/kernel/cpu/common.c                     |  642 ++++++
 arch/xen/i386/kernel/cpu/mtrr/Makefile                |   16 
 arch/xen/i386/kernel/cpu/mtrr/main.c                  |  165 +
 arch/xen/i386/kernel/entry.S                          | 1077 +++++++++++
 arch/xen/i386/kernel/head.S                           |  184 +
 arch/xen/i386/kernel/i386_ksyms.c                     |  194 ++
 arch/xen/i386/kernel/ioport.c                         |  129 +
 arch/xen/i386/kernel/irq.c                            |  258 ++
 arch/xen/i386/kernel/ldt.c                            |  264 ++
 arch/xen/i386/kernel/microcode.c                      |  163 +
 arch/xen/i386/kernel/pci-dma.c                        |  211 ++
 arch/xen/i386/kernel/process.c                        |  737 +++++++
 arch/xen/i386/kernel/setup.c                          | 1637 ++++++++++++++++
 arch/xen/i386/kernel/smp.c                            |  616 ++++++
 arch/xen/i386/kernel/smpboot.c                        | 1357 ++++++++++++++
 arch/xen/i386/kernel/time.c                           |  804 ++++++++
 arch/xen/i386/kernel/timers/Makefile                  |   17 
 arch/xen/i386/kernel/timers/timer_tsc.c               |  379 +++
 arch/xen/i386/kernel/traps.c                          |  976 ++++++++++
 arch/xen/i386/kernel/vsyscall.S                       |   15 
 arch/xen/i386/mm/Makefile                             |   24 
 arch/xen/i386/mm/fault.c                              |  562 +++++
 arch/xen/i386/mm/highmem.c                            |  100 +
 arch/xen/i386/mm/hypervisor.c                         |  222 ++
 arch/xen/i386/mm/init.c                               |  799 ++++++++
 arch/xen/i386/mm/ioremap.c                            |  442 ++++
 arch/xen/i386/mm/pgtable.c                            |  441 ++++
 arch/xen/i386/pci/Makefile                            |   31 
 arch/xen/i386/pci/direct.c                            |   81 
 arch/xen/i386/pci/irq.c                               |  155 +
 arch/xen/kernel/Makefile                              |   18 
 arch/xen/kernel/ctrl_if.c                             |  566 +++++
 arch/xen/kernel/devmem.c                              |  158 +
 arch/xen/kernel/evtchn.c                              |  590 ++++++
 arch/xen/kernel/fixup.c                               |   84 
 arch/xen/kernel/gnttab.c                              |  391 ++++
 arch/xen/kernel/reboot.c                              |  276 ++
 arch/xen/kernel/skbuff.c                              |   47 
 arch/xen/kernel/smp.c                                 |   19 
 arch/xen/kernel/xen_proc.c                            |   18 
 arch/xen/x86_64/Kconfig                               |  458 ++++
 arch/xen/x86_64/Makefile                              |   92 
 arch/xen/x86_64/kernel/Makefile                       |   66 
 arch/xen/x86_64/kernel/asm-offsets.c                  |   70 
 arch/xen/x86_64/kernel/e820.c                         |  533 +++++
 arch/xen/x86_64/kernel/early_printk.c                 |  240 ++
 arch/xen/x86_64/kernel/entry.S                        | 1181 ++++++++++++
 arch/xen/x86_64/kernel/head.S                         |  207 ++
 arch/xen/x86_64/kernel/head64.c                       |  132 +
 arch/xen/x86_64/kernel/init_task.c                    |   49 
 arch/xen/x86_64/kernel/ioport.c                       |   63 
 arch/xen/x86_64/kernel/irq.c                          |  105 +
 arch/xen/x86_64/kernel/ldt.c                          |  267 ++
 arch/xen/x86_64/kernel/pci-dma.c                      |  256 ++
 arch/xen/x86_64/kernel/pci-nommu.c                    |   96 
 arch/xen/x86_64/kernel/process.c                      |  713 +++++++
 arch/xen/x86_64/kernel/setup.c                        | 1379 ++++++++++++++
 arch/xen/x86_64/kernel/setup64.c                      |  346 +++
 arch/xen/x86_64/kernel/signal.c                       |  493 +++++
 arch/xen/x86_64/kernel/smp.c                          |  411 ++++
 arch/xen/x86_64/kernel/smpboot.c                      |  958 +++++++++
 arch/xen/x86_64/kernel/traps.c                        |  974 ++++++++++
 arch/xen/x86_64/kernel/vsyscall.c                     |  190 +
 arch/xen/x86_64/kernel/x8664_ksyms.c                  |  223 ++
 arch/xen/x86_64/mm/Makefile                           |   26 
 arch/xen/x86_64/mm/fault.c                            |  591 ++++++
 arch/xen/x86_64/mm/hypervisor.c                       |  270 ++
 arch/xen/x86_64/mm/init.c                             |  941 +++++++++
 arch/xen/x86_64/mm/ioremap.c                          |  466 ++++
 arch/xen/x86_64/mm/pageattr.c                         |  247 ++
 arch/xen/x86_64/pci/Makefile                          |   41 
 arch/xen/x86_64/pci/Makefile-BUS                      |   22 
 drivers/Makefile                                      |    1 
 drivers/char/mem.c                                    |    4 
 drivers/char/tty_io.c                                 |   21 
 drivers/xen/Makefile                                  |   13 
 drivers/xen/balloon/Makefile                          |    2 
 drivers/xen/balloon/balloon.c                         |  438 ++++
 drivers/xen/blkback/Makefile                          |    2 
 drivers/xen/blkback/blkback.c                         |  751 +++++++
 drivers/xen/blkback/common.h                          |  104 +
 drivers/xen/blkback/control.c                         |   61 
 drivers/xen/blkback/interface.c                       |  249 ++
 drivers/xen/blkback/vbd.c                             |  287 ++
 drivers/xen/blkfront/Kconfig                          |    6 
 drivers/xen/blkfront/Makefile                         |    3 
 drivers/xen/blkfront/blkfront.c                       | 1480 +++++++++++++++
 drivers/xen/blkfront/block.h                          |  117 +
 drivers/xen/blkfront/vbd.c                            |  507 +++++
 drivers/xen/blktap/Makefile                           |    3 
 drivers/xen/blktap/blktap.c                           |   87 
 drivers/xen/blktap/blktap.h                           |  252 ++
 drivers/xen/blktap/blktap_controlmsg.c                |  501 +++++
 drivers/xen/blktap/blktap_datapath.c                  |  472 ++++
 drivers/xen/blktap/blktap_userdev.c                   |  470 ++++
 drivers/xen/console/Makefile                          |    2 
 drivers/xen/console/console.c                         |  811 ++++++++
 drivers/xen/evtchn/Makefile                           |    2 
 drivers/xen/evtchn/evtchn.c                           |  430 ++++
 drivers/xen/netback/Makefile                          |    2 
 drivers/xen/netback/common.h                          |  103 +
 drivers/xen/netback/control.c                         |   56 
 drivers/xen/netback/interface.c                       |  380 +++
 drivers/xen/netback/netback.c                         |  819 ++++++++
 drivers/xen/netfront/Kconfig                          |    6 
 drivers/xen/netfront/Makefile                         |    2 
 drivers/xen/netfront/netfront.c                       | 1300 +++++++++++++
 drivers/xen/privcmd/Makefile                          |    2 
 drivers/xen/privcmd/privcmd.c                         |  232 ++
 drivers/xen/usbback/common.h                          |   85 
 drivers/xen/usbback/control.c                         |   61 
 drivers/xen/usbback/interface.c                       |  252 ++
 drivers/xen/usbback/usbback.c                         | 1070 +++++++++++
 drivers/xen/usbfront/usbfront.c                       | 1738 ++++++++++++++++++
 drivers/xen/usbfront/xhci.h                           |  183 +
 include/asm-generic/pgtable.h                         |   10 
 include/asm-xen/asm-i386/agp.h                        |   37 
 include/asm-xen/asm-i386/desc.h                       |  142 +
 include/asm-xen/asm-i386/dma-mapping.h                |  177 +
 include/asm-xen/asm-i386/fixmap.h                     |  173 +
 include/asm-xen/asm-i386/floppy.h                     |  147 +
 include/asm-xen/asm-i386/highmem.h                    |   82 
 include/asm-xen/asm-i386/hypercall.h                  |  536 +++++
 include/asm-xen/asm-i386/io.h                         |  425 ++++
 include/asm-xen/asm-i386/mach-xen/irq_vectors.h       |  137 +
 include/asm-xen/asm-i386/mach-xen/setup_arch_post.h   |   46 
 include/asm-xen/asm-i386/mach-xen/setup_arch_pre.h    |    5 
 include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h     |   59 
 include/asm-xen/asm-i386/mmu_context.h                |  102 +
 include/asm-xen/asm-i386/page.h                       |  203 ++
 include/asm-xen/asm-i386/param.h                      |   23 
 include/asm-xen/asm-i386/pci.h                        |  117 +
 include/asm-xen/asm-i386/pgalloc.h                    |   49 
 include/asm-xen/asm-i386/pgtable-2level-defs.h        |   19 
 include/asm-xen/asm-i386/pgtable-2level.h             |  105 +
 include/asm-xen/asm-i386/pgtable.h                    |  492 +++++
 include/asm-xen/asm-i386/processor.h                  |  684 +++++++
 include/asm-xen/asm-i386/ptrace.h                     |   69 
 include/asm-xen/asm-i386/segment.h                    |   96 
 include/asm-xen/asm-i386/setup.h                      |   66 
 include/asm-xen/asm-i386/spinlock.h                   |  250 ++
 include/asm-xen/asm-i386/synch_bitops.h               |   83 
 include/asm-xen/asm-i386/system.h                     |  521 +++++
 include/asm-xen/asm-i386/tlbflush.h                   |  102 +
 include/asm-xen/asm-i386/vga.h                        |   20 
 include/asm-xen/asm-x86_64/arch_hooks.h               |   27 
 include/asm-xen/asm-x86_64/bootsetup.h                |   41 
 include/asm-xen/asm-x86_64/desc.h                     |  240 ++
 include/asm-xen/asm-x86_64/dma-mapping.h              |  136 +
 include/asm-xen/asm-x86_64/fixmap.h                   |  117 +
 include/asm-xen/asm-x86_64/floppy.h                   |  204 ++
 include/asm-xen/asm-x86_64/hypercall.h                |  520 +++++
 include/asm-xen/asm-x86_64/io.h                       |  365 +++
 include/asm-xen/asm-x86_64/irq.h                      |   36 
 include/asm-xen/asm-x86_64/mach-xen/io_ports.h        |   30 
 include/asm-xen/asm-x86_64/mach-xen/irq_vectors.h     |  137 +
 include/asm-xen/asm-x86_64/mach-xen/mach_time.h       |  122 +
 include/asm-xen/asm-x86_64/mach-xen/mach_timer.h      |   48 
 include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h |   47 
 include/asm-xen/asm-x86_64/mach-xen/setup_arch_pre.h  |    5 
 include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h   |   59 
 include/asm-xen/asm-x86_64/mmu_context.h              |   76 
 include/asm-xen/asm-x86_64/page.h                     |  228 ++
 include/asm-xen/asm-x86_64/param.h                    |   22 
 include/asm-xen/asm-x86_64/pci.h                      |  148 +
 include/asm-xen/asm-x86_64/pda.h                      |   85 
 include/asm-xen/asm-x86_64/pgalloc.h                  |  171 +
 include/asm-xen/asm-x86_64/pgtable.h                  |  527 +++++
 include/asm-xen/asm-x86_64/processor.h                |  474 ++++
 include/asm-xen/asm-x86_64/ptrace.h                   |  119 +
 include/asm-xen/asm-x86_64/segment.h                  |   47 
 include/asm-xen/asm-x86_64/smp.h                      |  154 +
 include/asm-xen/asm-x86_64/synch_bitops.h             |   85 
 include/asm-xen/asm-x86_64/system.h                   |  395 ++++
 include/asm-xen/asm-x86_64/timer.h                    |   64 
 include/asm-xen/asm-x86_64/tlbflush.h                 |   97 +
 include/asm-xen/asm-x86_64/vga.h                      |   20 
 include/asm-xen/asm-x86_64/xor.h                      |  328 +++
 include/asm-xen/balloon.h                             |   51 
 include/asm-xen/ctrl_if.h                             |  160 +
 include/asm-xen/evtchn.h                              |  106 +
 include/asm-xen/foreign_page.h                        |   30 
 include/asm-xen/gnttab.h                              |   72 
 include/asm-xen/hypervisor.h                          |  140 +
 include/asm-xen/linux-public/privcmd.h                |   88 
 include/asm-xen/linux-public/suspend.h                |   43 
 include/asm-xen/queues.h                              |   81 
 include/asm-xen/xen-public/COPYING                    |   28 
 include/asm-xen/xen-public/arch-ia64.h                |  100 +
 include/asm-xen/xen-public/arch-x86_32.h              |  161 +
 include/asm-xen/xen-public/arch-x86_64.h              |  213 ++
 include/asm-xen/xen-public/dom0_ops.h                 |  393 ++++
 include/asm-xen/xen-public/event_channel.h            |  176 +
 include/asm-xen/xen-public/grant_table.h              |  280 ++
 include/asm-xen/xen-public/io/blkif.h                 |  108 +
 include/asm-xen/xen-public/io/domain_controller.h     |  777 ++++++++
 include/asm-xen/xen-public/io/ioreq.h                 |   61 
 include/asm-xen/xen-public/io/netif.h                 |   92 
 include/asm-xen/xen-public/io/ring.h                  |  199 ++
 include/asm-xen/xen-public/io/usbif.h                 |   66 
 include/asm-xen/xen-public/physdev.h                  |  106 +
 include/asm-xen/xen-public/sched_ctl.h                |   48 
 include/asm-xen/xen-public/trace.h                    |   59 
 include/asm-xen/xen-public/vmx_assist.h               |  101 +
 include/asm-xen/xen-public/xen.h                      |  478 ++++
 include/asm-xen/xen_proc.h                            |   13 
 include/linux/gfp.h                                   |    6 
 include/linux/highmem.h                               |    2 
 include/linux/irq.h                                   |    1 
 kernel/irq/manage.c                                   |   83 
 mm/highmem.c                                          |    9 
 mm/page_alloc.c                                       |    6 
 224 files changed, 59475 insertions(+), 30 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.11 -r 1.12 linux-2.6.11-xen.patch
Index: linux-2.6.11-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-xen.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6.11-xen.patch	21 Apr 2005 14:41:36 -0000	1.11
+++ linux-2.6.11-xen.patch	25 Apr 2005 14:38:31 -0000	1.12
@@ -1,6 +1,335 @@
+diff -Nurp pristine-linux-2.6.11/arch/xen/Kconfig tmp-linux-2.6.11-xen.patch/arch/xen/Kconfig
+--- pristine-linux-2.6.11/arch/xen/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/arch/xen/Kconfig	2005-04-24 23:13:31.000000000 -0400
+@@ -0,0 +1,190 @@
++#
++# For a description of the syntax of this configuration file,
++# see Documentation/kbuild/kconfig-language.txt.
++#
++
++mainmenu "Linux Kernel Configuration"
++
++config XEN
++	bool
++	default y
++	help
++	  This is the Linux Xen port.
++
++config ARCH_XEN
++	bool
++	default y
++
++
++config NO_IDLE_HZ
++	bool
++	default y
++
++
++menu "XEN"
++
++config XEN_PRIVILEGED_GUEST
++	bool "Privileged Guest (domain 0)"
++	default n
++	select XEN_PHYSDEV_ACCESS
++	help
++	  Support for privileged operation (domain 0)
++
++config XEN_PHYSDEV_ACCESS
++	bool "Physical device access"
++	default XEN_PRIVILEGED_GUEST
++	help
++	  Assume access is available to physical hardware devices
++	  (e.g., hard drives, network cards). This allows you to configure
++	  such devices and also includes some low-level support that is
++	  otherwise not compiled into the kernel.
++
++config XEN_BLKDEV_BACKEND
++	bool "Block-device backend driver"
++	depends on XEN_PHYSDEV_ACCESS
++	default y
++	help
++	  The block-device backend driver allows the kernel to export its
++	  block devices to other guests via a high-performance shared-memory
++	  interface.
++
++config XEN_BLKDEV_TAP_BE
++        bool "Block Tap support for backend driver (DANGEROUS)"
++        depends on XEN_BLKDEV_BACKEND
++        default n
++        help
++          If you intend to use the block tap driver, the backend domain will
++          not know the domain id of the real frontend, and so will not be able
++          to map its data pages.  This modifies the backend to attempt to map
++          from both the tap domain and the real frontend.  This presents a
++          security risk, and so should ONLY be used for development
++          with the blktap.  This option will be removed as the block drivers are
++          modified to use grant tables.
++
++config XEN_BLKDEV_GRANT
++        bool "Grant table substrate for block drivers"
++        depends on !XEN_BLKDEV_TAP_BE
++        default y
++        help
++          This introduces the use of grant tables as a data exhange mechanism
++          between the frontend and backend block drivers. This currently
++          conflicts with the block tap.
++
++config XEN_NETDEV_BACKEND
++	bool "Network-device backend driver"
++	depends on XEN_PHYSDEV_ACCESS
++	default y
++	help
++	  The network-device backend driver allows the kernel to export its
++	  network devices to other guests via a high-performance shared-memory
++	  interface.
++
++config XEN_BLKDEV_FRONTEND
++	bool "Block-device frontend driver"
++	default y
++	help
++	  The block-device frontend driver allows the kernel to access block
++	  devices mounted within another guest OS. Unless you are building a
++	  dedicated device-driver domain, or your master control domain
++	  (domain 0), then you almost certainly want to say Y here.
++
++config XEN_NETDEV_FRONTEND
++	bool "Network-device frontend driver"
++	default y
++	help
++	  The network-device frontend driver allows the kernel to access
++	  network interfaces within another guest OS. Unless you are building a
++	  dedicated device-driver domain, or your master control domain
++	  (domain 0), then you almost certainly want to say Y here.
++
++config XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER
++	bool "Pipelined transmitter (DANGEROUS)"
++	depends on XEN_NETDEV_FRONTEND
++	default n
++	help
++	  The driver will assume that the backend is pipelining packets for
++	  transmission: whenever packets are pending in the remote backend,
++	  the driver will not send asynchronous notifications when it queues
++	  additional packets for transmission.
++	  If the backend is a dumb domain, such as a transparent Ethernet
++	  bridge with no local IP interface, it is safe to say Y here to get
++	  slightly lower network overhead.
++	  If the backend has a local IP interface; or may be doing smart things
++	  like reassembling packets to perform firewall filtering; or if you
++	  are unsure; or if you experience network hangs when this option is
++	  enabled; then you must say N here.
++
++config XEN_BLKDEV_TAP
++	bool "Block device tap driver"
++	default n
++	help
++	  This driver allows a VM to interact on block device channels
++	  to other VMs.  Block messages may be passed through or redirected
++	  to a character device, allowing device prototyping in application
++	  space.  Odds are that you want to say N here.
++
++config XEN_SHADOW_MODE
++	bool "Fake shadow mode"
++	default n
++    help
++      fakes out a shadow mode kernel
++
++
++config XEN_SCRUB_PAGES
++	bool "Scrub memory before freeing it to Xen"
++	default y
++	help
++	  Erase memory contents before freeing it back to Xen's global
++	  pool. This ensures that any secrets contained within that
++	  memory (e.g., private keys) cannot be found by other guests that
++	  may be running on the machine. Most people will want to say Y here.
++	  If security is not a concern then you may increase performance by
++	  saying N.
++
++choice
++	prompt "Processor Type"
++	default XEN_X86
++
++config XEN_X86
++	bool "X86"
++	help
++	  Choose this option if your computer is a X86 architecture.
++
++config XEN_X86_64
++	bool "X86_64"
++	help
++	  Choose this option if your computer is a X86_64 architecture.
++
++endchoice
++
++endmenu
++
++config HAVE_ARCH_DEV_ALLOC_SKB
++	bool
++	default y
++
++source "init/Kconfig"
++
++if XEN_X86
++source "arch/xen/i386/Kconfig"
++endif
++
++if XEN_X86_64
++source "arch/xen/x86_64/Kconfig"
++endif
++
++menu "Executable file formats"
++
++source "fs/Kconfig.binfmt"
++
++endmenu
++
++source "arch/xen/Kconfig.drivers"
++
++source "fs/Kconfig"
++
++source "security/Kconfig"
++
[...83725 lines suppressed...]
++	unsigned long		cr3;		/* page table directory */
++	unsigned long		cr4;
++	unsigned long		idtr_limit;	/* idt */
++	unsigned long		idtr_base;
++	unsigned long		gdtr_limit;	/* gdt */
++	unsigned long		gdtr_base;
++	unsigned long		cs_sel;		/* cs selector */
++	unsigned long		cs_limit;
++	unsigned long		cs_base;
++	union vmcs_arbytes	cs_arbytes;
++	unsigned long		ds_sel;		/* ds selector */
++	unsigned long		ds_limit;
++	unsigned long		ds_base;
++	union vmcs_arbytes	ds_arbytes;
++	unsigned long		es_sel;		/* es selector */
++	unsigned long		es_limit;
++	unsigned long		es_base;
++	union vmcs_arbytes	es_arbytes;
++	unsigned long		ss_sel;		/* ss selector */
++	unsigned long		ss_limit;
++	unsigned long		ss_base;
++	union vmcs_arbytes	ss_arbytes;
++	unsigned long		fs_sel;		/* fs selector */
++	unsigned long		fs_limit;
++	unsigned long		fs_base;
++	union vmcs_arbytes	fs_arbytes;
++	unsigned long		gs_sel;		/* gs selector */
++	unsigned long		gs_limit;
++	unsigned long		gs_base;
++	union vmcs_arbytes	gs_arbytes;
++	unsigned long		tr_sel;		/* task selector */
++	unsigned long		tr_limit;
++	unsigned long		tr_base;
++	union vmcs_arbytes	tr_arbytes;
++	unsigned long		ldtr_sel;	/* ldtr selector */
++	unsigned long		ldtr_limit;
++	unsigned long		ldtr_base;
++	union vmcs_arbytes	ldtr_arbytes;
++} vmx_assist_context_t;
++
++#endif /* __ASSEMBLY__ */
++
++#endif /* _VMX_ASSIST_H_ */
++
 diff -Nurp pristine-linux-2.6.11/include/asm-xen/xen-public/xen.h tmp-linux-2.6.11-xen.patch/include/asm-xen/xen-public/xen.h
 --- pristine-linux-2.6.11/include/asm-xen/xen-public/xen.h	1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6.11-xen.patch/include/asm-xen/xen-public/xen.h	2005-03-31 22:53:50.000000000 -0500
-@@ -0,0 +1,474 @@
++++ tmp-linux-2.6.11-xen.patch/include/asm-xen/xen-public/xen.h	2005-04-24 23:13:33.000000000 -0400
+@@ -0,0 +1,478 @@
 +/******************************************************************************
 + * xen.h
 + * 
@@ -40388,11 +59949,11 @@
 + * linear_addr: Linear address to be flushed from the local TLB.
 + * 
 + * cmd: MMUEXT_TLB_FLUSH_MULTI
-+ * cpuset: Set of VCPUs to be flushed.
++ * cpuset: Pointer to bitmap of VCPUs to be flushed.
 + * 
 + * cmd: MMUEXT_INVLPG_MULTI
 + * linear_addr: Linear address to be flushed.
-+ * cpuset: Set of VCPUs to be flushed.
++ * cpuset: Pointer to bitmap of VCPUs to be flushed.
 + * 
 + * cmd: MMUEXT_TLB_FLUSH_ALL
 + * No additional arguments. Flushes all VCPUs' TLBs.
@@ -40411,20 +59972,20 @@
 + * mfn: Machine frame number to be reassigned to the FD.
 + *      (NB. page must currently belong to the calling domain).
 + */
-+#define MMUEXT_PIN_L1_TABLE      0 /* ptr = MA of frame to pin               */
-+#define MMUEXT_PIN_L2_TABLE      1 /* ptr = MA of frame to pin               */
-+#define MMUEXT_PIN_L3_TABLE      2 /* ptr = MA of frame to pin               */
-+#define MMUEXT_PIN_L4_TABLE      3 /* ptr = MA of frame to pin               */
-+#define MMUEXT_UNPIN_TABLE       4 /* ptr = MA of frame to unpin             */
-+#define MMUEXT_NEW_BASEPTR       5 /* ptr = MA of new pagetable base         */
-+#define MMUEXT_TLB_FLUSH_LOCAL   6 /* ptr = NULL                             */
-+#define MMUEXT_INVLPG_LOCAL      7 /* ptr = VA to invalidate                 */
-+#define MMUEXT_TLB_FLUSH_MULTI   8 /* ptr = NULL; mask = VCPUs to flush      */
-+#define MMUEXT_INVLPG_MULTI      9 /* ptr = VA to inval.; mask = VCPUs       */
++#define MMUEXT_PIN_L1_TABLE      0
++#define MMUEXT_PIN_L2_TABLE      1
++#define MMUEXT_PIN_L3_TABLE      2
++#define MMUEXT_PIN_L4_TABLE      3
++#define MMUEXT_UNPIN_TABLE       4
++#define MMUEXT_NEW_BASEPTR       5
++#define MMUEXT_TLB_FLUSH_LOCAL   6
++#define MMUEXT_INVLPG_LOCAL      7
++#define MMUEXT_TLB_FLUSH_MULTI   8
++#define MMUEXT_INVLPG_MULTI      9
 +#define MMUEXT_TLB_FLUSH_ALL    10
 +#define MMUEXT_INVLPG_ALL       11
 +#define MMUEXT_FLUSH_CACHE      12
-+#define MMUEXT_SET_LDT          13 /* ptr = VA of table; val = # entries     */
++#define MMUEXT_SET_LDT          13
 +#define MMUEXT_REASSIGN_PAGE    14
 +#define MMUEXT_NEW_USER_BASEPTR 15
 +
@@ -40441,17 +60002,21 @@
 +        /* SET_LDT */
 +        unsigned int nr_ents;
 +        /* TLB_FLUSH_MULTI, INVLPG_MULTI */
-+        unsigned long cpuset;
++        void *cpuset;
 +    };
 +};
 +#endif
 +
 +/* These are passed as 'flags' to update_va_mapping. They can be ORed. */
-+#define UVMF_TLB_FLUSH_LOCAL    1 /* Flush local CPU's TLB.          */
-+#define UVMF_INVLPG_LOCAL       2 /* Flush VA from local CPU's TLB.  */
-+#define UVMF_TLB_FLUSH_ALL      3 /* Flush all TLBs.                 */
-+#define UVMF_INVLPG_ALL         4 /* Flush VA from all TLBs.         */
-+#define UVMF_FLUSH_MASK         7
++/* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap.   */
++/* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer.         */
++#define UVMF_NONE               (0UL)    /* No flushing at all.   */
++#define UVMF_TLB_FLUSH          (1UL<<0) /* Flush entire TLB(s).  */
++#define UVMF_INVLPG             (2UL<<0) /* Flush only one entry. */
++#define UVMF_FLUSHTYPE_MASK     (3UL<<0)
++#define UVMF_MULTI              (0UL<<1) /* Flush subset of TLBs. */
++#define UVMF_LOCAL              (0UL<<2) /* Flush local TLB.      */
++#define UVMF_ALL                (1UL<<2) /* Flush all TLBs.       */
 +
 +/*
 + * Commands to HYPERVISOR_sched_op().
@@ -40725,9 +60290,26 @@
 +#endif /* !__ASSEMBLY__ */
 +
 +#endif /* __XEN_PUBLIC_XEN_H__ */
+diff -Nurp pristine-linux-2.6.11/include/asm-xen/xen_proc.h tmp-linux-2.6.11-xen.patch/include/asm-xen/xen_proc.h
+--- pristine-linux-2.6.11/include/asm-xen/xen_proc.h	1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/include/asm-xen/xen_proc.h	2005-04-24 23:13:32.000000000 -0400
+@@ -0,0 +1,13 @@
++
++#ifndef __ASM_XEN_PROC_H__
++#define __ASM_XEN_PROC_H__
++
++#include <linux/config.h>
++#include <linux/proc_fs.h>
++
++extern struct proc_dir_entry *create_xen_proc_entry(
++    const char *name, mode_t mode);
++extern void remove_xen_proc_entry(
++    const char *name);
++
++#endif /* __ASM_XEN_PROC_H__ */
 diff -Nurp pristine-linux-2.6.11/include/linux/gfp.h tmp-linux-2.6.11-xen.patch/include/linux/gfp.h
 --- pristine-linux-2.6.11/include/linux/gfp.h	2005-03-02 02:37:50.000000000 -0500
-+++ tmp-linux-2.6.11-xen.patch/include/linux/gfp.h	2005-03-31 22:53:36.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/include/linux/gfp.h	2005-04-24 23:13:36.000000000 -0400
 @@ -75,8 +75,12 @@ struct vm_area_struct;
   * optimized to &contig_page_data at compile-time.
   */
@@ -40744,7 +60326,7 @@
  extern struct page *
 diff -Nurp pristine-linux-2.6.11/include/linux/highmem.h tmp-linux-2.6.11-xen.patch/include/linux/highmem.h
 --- pristine-linux-2.6.11/include/linux/highmem.h	2005-03-02 02:38:17.000000000 -0500
-+++ tmp-linux-2.6.11-xen.patch/include/linux/highmem.h	2005-03-31 22:53:36.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/include/linux/highmem.h	2005-04-24 23:13:37.000000000 -0400
 @@ -13,10 +13,12 @@
  
  /* declarations for linux/mm/highmem.c */
@@ -40760,7 +60342,7 @@
  {
 diff -Nurp pristine-linux-2.6.11/include/linux/irq.h tmp-linux-2.6.11-xen.patch/include/linux/irq.h
 --- pristine-linux-2.6.11/include/linux/irq.h	2005-03-02 02:38:37.000000000 -0500
-+++ tmp-linux-2.6.11-xen.patch/include/linux/irq.h	2005-03-31 22:53:36.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/include/linux/irq.h	2005-04-24 23:13:37.000000000 -0400
 @@ -74,6 +74,7 @@ extern irq_desc_t irq_desc [NR_IRQS];
  #include <asm/hw_irq.h> /* the arch dependent stuff */
  
@@ -40771,7 +60353,7 @@
  extern cpumask_t irq_affinity[NR_IRQS];
 diff -Nurp pristine-linux-2.6.11/kernel/irq/manage.c tmp-linux-2.6.11-xen.patch/kernel/irq/manage.c
 --- pristine-linux-2.6.11/kernel/irq/manage.c	2005-03-02 02:38:37.000000000 -0500
-+++ tmp-linux-2.6.11-xen.patch/kernel/irq/manage.c	2005-03-31 22:53:36.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/kernel/irq/manage.c	2005-04-24 23:13:31.000000000 -0400
 @@ -146,9 +146,14 @@ int can_request_irq(unsigned int irq, un
  	return !action;
  }
@@ -40898,7 +60480,7 @@
  EXPORT_SYMBOL(free_irq);
 diff -Nurp pristine-linux-2.6.11/mm/highmem.c tmp-linux-2.6.11-xen.patch/mm/highmem.c
 --- pristine-linux-2.6.11/mm/highmem.c	2005-03-02 02:38:12.000000000 -0500
-+++ tmp-linux-2.6.11-xen.patch/mm/highmem.c	2005-03-31 22:53:36.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/mm/highmem.c	2005-04-24 23:13:33.000000000 -0400
 @@ -146,6 +146,15 @@ start:
  	return vaddr;
  }
@@ -40917,7 +60499,7 @@
  	unsigned long vaddr;
 diff -Nurp pristine-linux-2.6.11/mm/page_alloc.c tmp-linux-2.6.11-xen.patch/mm/page_alloc.c
 --- pristine-linux-2.6.11/mm/page_alloc.c	2005-03-02 02:38:34.000000000 -0500
-+++ tmp-linux-2.6.11-xen.patch/mm/page_alloc.c	2005-03-31 22:53:36.000000000 -0500
++++ tmp-linux-2.6.11-xen.patch/mm/page_alloc.c	2005-04-24 23:13:32.000000000 -0400
 @@ -332,7 +332,8 @@ void __free_pages_ok(struct page *page, 
  	LIST_HEAD(list);
  	int i;

linux-2.6.9-xen-compile.patch:
 linux-2.6.10/arch/xen/i386/pci/irq.c                              |    1 
 linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h |    2 
 linux-2.6.11/arch/xen/Kconfig                                     |    2 
 linux-2.6.11/arch/xen/i386/kernel/Makefile                        |    6 
 linux-2.6.11/arch/xen/i386/kernel/i386_ksyms.c                    |    5 
 linux-2.6.11/arch/xen/i386/kernel/irq.c                           |    5 
 linux-2.6.11/arch/xen/i386/kernel/process.c                       |    9 -
 linux-2.6.11/arch/xen/i386/kernel/putuser.S                       |   87 ++++++++++
 linux-2.6.11/arch/xen/i386/kernel/smpboot.c                       |    2 
 linux-2.6.11/arch/xen/i386/kernel/time.c                          |   45 ++++-
 linux-2.6.11/arch/xen/i386/pci/irq.c                              |    4 
 linux-2.6.11/drivers/char/mem.c                                   |    2 
 linux-2.6.11/drivers/char/tty_io.c                                |    2 
 linux-2.6.11/include/asm-generic/pgtable.h                        |    1 
 linux-2.6.11/include/asm-xen/asm-i386/pgtable.h                   |   21 +-
 linux-2.6.11/include/asm-xen/asm-i386/processor.h                 |   21 ++
 linux-2.6.11/mm/memory.c                                          |    4 
 linux-2.6.8/arch/xen/i386/kernel/time.c                           |    2 
 linux-2.6.9/Makefile                                              |    2 
 linux-2.6.9/arch/xen/Makefile                                     |    3 
 linux-2.6.9/arch/xen/boot/Makefile                                |    3 
 linux-2.6.9/kernel/profile.c                                      |    1 
 22 files changed, 194 insertions(+), 36 deletions(-)

Index: linux-2.6.9-xen-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-xen-compile.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- linux-2.6.9-xen-compile.patch	21 Apr 2005 14:41:36 -0000	1.37
+++ linux-2.6.9-xen-compile.patch	25 Apr 2005 14:38:33 -0000	1.38
@@ -21,24 +21,6 @@
  #include <linux/highmem.h>
  #include <asm/sections.h>
  #include <asm/semaphore.h>
---- linux-2.6.9/include/asm-i386/irq.h~	2004-12-24 01:46:10.908739264 -0500
-+++ linux-2.6.9/include/asm-i386/irq.h	2004-12-24 01:48:25.183326424 -0500
-@@ -28,10 +28,14 @@ extern void release_vm86_irqs(struct tas
- #endif
- 
- #ifdef CONFIG_4KSTACKS
-+ #ifndef CONFIG_XEN
-   extern void irq_ctx_init(int cpu);
- # define __ARCH_HAS_DO_SOFTIRQ
-+ #endif
- #else
-+ #ifdef CONFIG_XEN
- # define irq_ctx_init(cpu) do { } while (0)
-+ #endif
- #endif
- 
- #ifdef CONFIG_IRQBALANCE
-
 --- linux-2.6.9/arch/xen/boot/Makefile.bzi	2004-11-17 22:07:46.000000000 -0500
 +++ linux-2.6.9/arch/xen/boot/Makefile	2004-11-17 22:12:07.000000000 -0500
 @@ -6,3 +6,6 @@ vmlinuz: vmlinux-stripped FORCE
@@ -174,9 +156,9 @@
 +	}								\
 +} while (0)
 +
+ #ifndef CONFIG_XEN_SHADOW_MODE
  void make_lowmem_page_readonly(void *va);
  void make_lowmem_page_writable(void *va);
- void make_page_readonly(void *va);
 --- linux-2.6.11/mm/memory.c.xen	2005-03-22 11:58:40.000000000 -0500
 +++ linux-2.6.11/mm/memory.c	2005-03-22 13:00:27.000000000 -0500
 @@ -1700,7 +1700,7 @@ do_anonymous_page(struct mm_struct *mm, 




More information about the fedora-cvs-commits mailing list