rpms/kernel/FC-6 kernel-2.6.spec, 1.2786, 1.2787 linux-2.6-xen-pvfb.patch, 1.4, 1.5 linux-2.6-xen.patch, 1.73, 1.74 linux-2.6-xen-blktap-cleanup.patch, 1.1, NONE linux-2.6-xen-blktap-dynamic-major.patch, 1.1, NONE linux-2.6-xen-blktap-fixes.patch, 1.1, NONE linux-2.6-xen-blktap-sysfs.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Oct 13 19:01:09 UTC 2006


Author: quintela

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen-pvfb.patch linux-2.6-xen.patch 
Removed Files:
	linux-2.6-xen-blktap-cleanup.patch 
	linux-2.6-xen-blktap-dynamic-major.patch 
	linux-2.6-xen-blktap-fixes.patch 
	linux-2.6-xen-blktap-sysfs.patch 
Log Message:
- xen kernel update:
  * linux-2.6-xen-fedora changeset:   36227:84594d199837
  * xen-3.0.3-testing changeset:   11740:64b3e8596dc9
  * linux-2.6-xen-3.0.3 changeset:   22940:410c17270c74
  * remove all the blktap patches already included upstream.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2786
retrieving revision 1.2787
diff -u -r1.2786 -r1.2787
--- kernel-2.6.spec	13 Oct 2006 18:40:29 -0000	1.2786
+++ kernel-2.6.spec	13 Oct 2006 19:01:06 -0000	1.2787
@@ -378,10 +378,6 @@
 Patch957: linux-2.6-xen-x86-relocatable.patch
 Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
 Patch959: linux-2.6-xen-x86-unwinder.patch
-Patch960: linux-2.6-xen-blktap-fixes.patch
-Patch961: linux-2.6-xen-blktap-cleanup.patch
-Patch962: linux-2.6-xen-blktap-dynamic-major.patch
-Patch963: linux-2.6-xen-blktap-sysfs.patch
 Patch990: linux-2.6-xen-pvfb.patch
 
 #
@@ -942,15 +938,6 @@
 # Unwinder fixes for Xen.
 %patch959 -p1
 
-# xen blktap fixes
-%patch960 -p1
-# The blktap patch needs to rename a file.  For now, that is far more easily
-# done in the spec file than in the patch itself.
-mv drivers/xen/blktap/blktap.c drivers/xen/blktap/blktapmain.c
-%patch961 -p1
-%patch962 -p1
-%patch963 -p1
-
 # xen framebuffer patches
 %patch990 -p1
 
@@ -2031,6 +2018,11 @@
 %changelog
 * Fri Oct 13 2006 Juan Quintela <quintela at redhat.com> 
 - update xen HV cset 11740.
+- xen kernel update:
+  * linux-2.6-xen-fedora changeset:   36227:84594d199837
+  * xen-3.0.3-testing changeset:   11740:64b3e8596dc9
+  * linux-2.6-xen-3.0.3 changeset:   22940:410c17270c74
+  * remove all the blktap patches already included upstream.
 
 * Fri Oct 13 2006 Steven Whitehouse <swhiteho at redhat.com>
 - Fix for bz 210493 gfs2 endian bug from upstream

linux-2.6-xen-pvfb.patch:
 arch/i386/kernel/setup-xen.c   |    7 
 arch/ia64/kernel/setup.c       |    4 
 arch/x86_64/kernel/setup-xen.c |    7 
 drivers/char/tty_io.c          |    6 
 drivers/xen/Kconfig            |   23 +
 drivers/xen/Makefile           |    2 
 drivers/xen/console/console.c  |   49 ++
 drivers/xen/xenfb/Makefile     |    1 
 drivers/xen/xenfb/xenfb.c      |  699 +++++++++++++++++++++++++++++++++++++----
 drivers/xen/xenkbd/Makefile    |    1 
 drivers/xen/xenkbd/xenkbd.c    |  268 +++++++++++++--
 include/linux/xenfb.h          |  132 +++++++
 include/linux/xenkbd.h         |  112 +++++-
 13 files changed, 1163 insertions(+), 148 deletions(-)

Index: linux-2.6-xen-pvfb.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-xen-pvfb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-pvfb.patch	6 Sep 2006 03:46:38 -0000	1.4
+++ linux-2.6-xen-pvfb.patch	13 Oct 2006 19:01:06 -0000	1.5
@@ -56,17 +56,6 @@
  obj-$(CONFIG_XEN_PCIDEV_FRONTEND)	+= pcifront/
 +obj-$(CONFIG_XEN_FRAMEBUFFER)		+= xenfb/
 +obj-$(CONFIG_XEN_KEYBOARD)		+= xenkbd/
-diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/mm/memory.c
---- linux-2.6-xen-sparse/mm/memory.c	Tue Aug 15 19:53:55 2006 +0100
-+++ linux-2.6-xen-sparse/mm/memory.c	Fri Aug 18 16:17:58 2006 -0400
-@@ -881,6 +881,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL(zap_page_range);
- 
- /*
-  * Do a quick page-table lookup for a single page.
 diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/xenfb/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ linux-2.6-xen-sparse/drivers/xen/xenfb/Makefile	Fri Aug 18 16:17:58 2006 -0400

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    8 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  739 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1213 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  200 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2771 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1832 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1101 +++++++
 arch/i386/kernel/traps-xen.c                        | 1184 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vmlinux.lds.S                      |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/irqflags.c                       |   99 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  443 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  584 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1206 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   60 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/dig/setup.c                               |   17 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  125 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  833 ++++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  757 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1213 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  191 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/irqflags-xen.c                   |  100 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1637 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  361 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1173 ++++++++
 arch/x86_64/kernel/vmlinux.lds.S                    |   31 
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  398 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  637 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  549 +++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  468 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  846 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    6 
 drivers/xen/blktap/blktapmain.c                     | 1393 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  164 +
 drivers/xen/blktap/xenbus.c                         |  366 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  688 ++++
 drivers/xen/console/xencons_ring.c                  |  143 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  868 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  483 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  384 ++
 drivers/xen/core/skbuff.c                           |  144 +
 drivers/xen/core/smpboot.c                          |  429 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  141 +
 drivers/xen/netback/interface.c                     |  358 ++
 drivers/xen/netback/loopback.c                      |  320 ++
 drivers/xen/netback/netback.c                       | 1500 ++++++++++
 drivers/xen/netback/xenbus.c                        |  479 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 2138 +++++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  458 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  289 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   86 
 drivers/xen/tpmback/interface.c                     |  182 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  287 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  147 +
 drivers/xen/xenbus/xenbus_client.c                  |  299 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  203 +
 drivers/xen/xenbus/xenbus_comms.h                   |   45 
 drivers/xen/xenbus/xenbus_dev.c                     |  356 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1190 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  853 ++++++
 fs/Kconfig                                          |    1 
 include/asm-generic/vmlinux.lds.h                   |    3 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    1 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   72 
 include/asm-i386/mach-xen/asm/hypercall.h           |  389 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  234 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/irqflags.h            |   80 
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/maddr.h               |  160 +
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  220 +
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   87 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  185 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   81 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  202 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  491 +++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    5 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   44 
 include/asm-ia64/dma-mapping.h                      |  100 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  423 +++
 include/asm-ia64/hypervisor.h                       |  218 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec_dig.h                      |   15 
 include/asm-ia64/maddr.h                            |   92 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |   50 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    4 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/ipi.h                            |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  136 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  389 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/irqflags.h          |   65 
 include/asm-x86_64/mach-xen/asm/maddr.h             |  139 +
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  208 +
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  558 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  504 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  264 +
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/elfnote.h                             |   90 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    4 
 include/linux/skbuff.h                              |   15 
 include/xen/balloon.h                               |   57 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hvm.h                                   |   24 
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |  102 
 include/xen/interface/arch-ia64.h                   |  448 +++
 include/xen/interface/arch-powerpc.h                |  115 
 include/xen/interface/arch-x86_32.h                 |  255 +
 include/xen/interface/arch-x86_64.h                 |  322 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  102 
 include/xen/interface/domctl.h                      |  392 ++
 include/xen/interface/elfnote.h                     |  133 
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/e820.h                    |   32 
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/platform.h                    |  125 
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sysctl.h                      |  151 +
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   26 
 include/xen/interface/xen.h                         |  581 ++++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  110 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   88 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  306 ++
 include/xen/xencons.h                               |   17 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    4 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   27 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 424 files changed, 88579 insertions(+), 221 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.73 -r 1.74 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-xen.patch,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- linux-2.6-xen.patch	3 Oct 2006 21:55:51 -0000	1.73
+++ linux-2.6-xen.patch	13 Oct 2006 19:01:06 -0000	1.74
@@ -1,11 +1,11 @@
   * linux-2.6 /mnt/ro/repos/hg/linux-2.6
-changeset:   36267:7fd51353a76f
+changeset:   39746:07aee2b95c3f
   * linux-2.6-xen-fedora /mnt/ro/repos/hg/linux-2.6-xen-fedora
-changeset:   36192:656cc38a840d
+changeset:   36227:84594d199837
   * xen-3.0.3-testing /mnt/ro/repos/hg/xen-3.0.3-testing
-changeset:   11633:000aa9510e55
+changeset:   11740:64b3e8596dc9
   * linux-2.6-xen-3.0.3 /mnt/ro/repos/hg/linux-2.6-xen-3.0.3
-changeset:   22908:55fbb4a85ac3
+changeset:   22940:410c17270c74
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
 --- /scratch/src/linux-2.6.18/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-26 16:46:14.000000000 +0200
@@ -2734,7 +2734,7 @@
   * already pushed 3 words if it hits on the sysenter instruction:
   * eflags, cs and eip.
   *
-@@ -698,7 +698,7 @@ device_not_available_emulate:
+@@ -701,7 +701,7 @@ device_not_available_emulate:
  	cmpw $__KERNEL_CS,4(%esp);		\
  	jne ok;					\
  label:						\
@@ -7842,7 +7842,7 @@
  	$(call if_changed,syscall)
  
  # We also create a special relocatable object that should mirror the symbol
-@@ -83,9 +83,20 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
+@@ -77,9 +83,20 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
  
  SYSCFLAGS_vsyscall-syms.o = -r
  $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
@@ -18703,8 +18703,8 @@
 +
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/arch/i386/mm/ioremap-xen.c linux-2.6-xen-fedora/arch/i386/mm/ioremap-xen.c
 --- /scratch/src/linux-2.6.18/arch/i386/mm/ioremap-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/mm/ioremap-xen.c	2006-09-01 02:57:38.000000000 +0200
-@@ -0,0 +1,439 @@
++++ linux-2.6-xen-fedora/arch/i386/mm/ioremap-xen.c	2006-10-13 04:38:08.000000000 +0200
+@@ -0,0 +1,443 @@
 +/*
 + * arch/i386/mm/ioremap.c
 + *
@@ -18736,6 +18736,8 @@
 +{
 +	mmu_update_t **v = (mmu_update_t **)data;
 +
++	BUG_ON(!pte_none(*pte));
++
 +	(*v)->ptr = ((u64)pfn_to_mfn(page_to_pfn(pmd_page)) <<
 +		     PAGE_SHIFT) | ((unsigned long)pte & ~PAGE_MASK);
 +	(*v)++;
@@ -18817,12 +18819,14 @@
 +			   pgprot_t prot,
 +			   domid_t  domid)
 +{
-+	/* Same as remap_pfn_range(). */
-+	vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
++	if (xen_feature(XENFEAT_auto_translated_physmap))
++		return remap_pfn_range(vma, address, mfn, size, prot);
 +
 +	if (domid == DOMID_SELF)
 +		return -EINVAL;
 +
++	vma->vm_flags |= VM_IO | VM_RESERVED;
++
 +	vma->vm_mm->context.has_foreign_mappings = 1;
 +
 +	return __direct_remap_pfn_range(
@@ -36534,8 +36538,8 @@
 +}
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/arch/x86_64/kernel/process-xen.c linux-2.6-xen-fedora/arch/x86_64/kernel/process-xen.c
 --- /scratch/src/linux-2.6.18/arch/x86_64/kernel/process-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/x86_64/kernel/process-xen.c	2006-08-30 17:53:05.000000000 +0200
-@@ -0,0 +1,794 @@
++++ linux-2.6-xen-fedora/arch/x86_64/kernel/process-xen.c	2006-10-13 04:38:08.000000000 +0200
+@@ -0,0 +1,793 @@
 +/*
 + *  linux/arch/x86-64/kernel/process.c
 + *
@@ -36876,7 +36880,6 @@
 +	struct user_desc ud = { 
 +		.base_addr = addr,
 +		.limit = 0xfffff,
-+		.contents = (3 << 3), /* user */
 +		.seg_32bit = 1,
 +		.limit_in_pages = 1,
 +		.useable = 1,
@@ -46260,8 +46263,8 @@
  	  This selects whether you want to include the driver for the standard
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/drivers/xen/balloon/balloon.c linux-2.6-xen-fedora/drivers/xen/balloon/balloon.c
 --- /scratch/src/linux-2.6.18/drivers/xen/balloon/balloon.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/balloon/balloon.c	2006-08-25 02:47:31.000000000 +0200
-@@ -0,0 +1,625 @@
++++ linux-2.6-xen-fedora/drivers/xen/balloon/balloon.c	2006-10-13 04:38:08.000000000 +0200
+@@ -0,0 +1,637 @@
 +/******************************************************************************
 + * balloon.c
 + *
@@ -46797,75 +46800,87 @@
 +	return 0;
 +}
 +
-+struct page *balloon_alloc_empty_page_range(unsigned long nr_pages)
++struct page **alloc_empty_pages_and_pagevec(int nr_pages)
 +{
-+	unsigned long vstart, flags;
-+	unsigned int  order = get_order(nr_pages * PAGE_SIZE);
-+	int ret;
-+	unsigned long i;
-+	struct page *page;
++	unsigned long vaddr, flags;
++	struct page *page, **pagevec;
++	int i, ret;
 +
-+	vstart = __get_free_pages(GFP_KERNEL, order);
-+	if (vstart == 0)
++	pagevec = kmalloc(sizeof(page) * nr_pages, GFP_KERNEL);
++	if (pagevec == NULL)
 +		return NULL;
 +
-+	scrub_pages(vstart, 1 << order);
-+
-+	balloon_lock(flags);
-+	if (xen_feature(XENFEAT_auto_translated_physmap)) {
-+		unsigned long gmfn = __pa(vstart) >> PAGE_SHIFT;
-+		struct xen_memory_reservation reservation = {
-+			.nr_extents   = 1,
-+			.extent_order = order,
-+			.domid        = DOMID_SELF
-+		};
-+		set_xen_guest_handle(reservation.extent_start, &gmfn);
-+		ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
-+					   &reservation);
-+		if (ret == -ENOSYS)
-+			goto err;
-+		BUG_ON(ret != 1);
-+	} else {
-+		ret = apply_to_page_range(&init_mm, vstart, PAGE_SIZE << order,
-+					  dealloc_pte_fn, NULL);
-+		if (ret == -ENOSYS)
++	for (i = 0; i < nr_pages; i++) {
++		page = pagevec[i] = alloc_page(GFP_KERNEL);
++		if (page == NULL)
 +			goto err;
-+		BUG_ON(ret);
-+	}
-+	current_pages -= 1UL << order;
-+	totalram_pages = current_pages;
-+	balloon_unlock(flags);
 +
-+	schedule_work(&balloon_worker);
++		vaddr = (unsigned long)page_address(page);
 +
-+	flush_tlb_all();
++		scrub_pages(vaddr, 1);
 +
-+	page = virt_to_page(vstart);
++		balloon_lock(flags);
 +
-+	for (i = 0; i < (1UL << order); i++)
-+		init_page_count(page + i);
++		if (xen_feature(XENFEAT_auto_translated_physmap)) {
++			unsigned long gmfn = page_to_pfn(page);
++			struct xen_memory_reservation reservation = {
++				.nr_extents   = 1,
++				.extent_order = 0,
++				.domid        = DOMID_SELF
++			};
++			set_xen_guest_handle(reservation.extent_start, &gmfn);
++			ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
++						   &reservation);
++			if (ret == 1)
++				ret = 0; /* success */
++		} else {
++			ret = apply_to_page_range(&init_mm, vaddr, PAGE_SIZE,
++						  dealloc_pte_fn, NULL);
++		}
 +
-+	return page;
++		if (ret != 0) {
++			balloon_unlock(flags);
++			__free_page(page);
++			goto err;
++		}
++
++		totalram_pages = --current_pages;
++
++		balloon_unlock(flags);
++	}
[...1991 lines suppressed...]
 +					      (tx->addr & ~PAGE_MASK)),
 +				     &data[offset], tocopy, isuserbuffer)) {
 +			tpmif_put(tpmif);
@@ -66435,7 +66571,7 @@
 +		}
 +		tx->size = tocopy;
 +
-+		gnttab_set_unmap_op(&unmap_op, MMAP_VADDR(tpmif, i),
++		gnttab_set_unmap_op(&unmap_op, idx_to_kaddr(tpmif, i),
 +				    GNTMAP_host_map, handle);
 +
 +		if (unlikely
@@ -66548,7 +66684,7 @@
 +
 +		tx = &tpmif->tx->ring[i].req;
 +
-+		gnttab_set_map_op(&map_op, MMAP_VADDR(tpmif, i),
++		gnttab_set_map_op(&map_op, idx_to_kaddr(tpmif, i),
 +				  GNTMAP_host_map, tx->ref, tpmif->domid);
 +
 +		if (unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref,
@@ -66571,10 +66707,10 @@
 +		}
 +
 +		DPRINTK("Copying from mapped memory at %08lx\n",
-+			(unsigned long)(MMAP_VADDR(tpmif, i) |
++			(unsigned long)(idx_to_kaddr(tpmif, i) |
 +					(tx->addr & ~PAGE_MASK)));
 +
-+		src = (void *)(MMAP_VADDR(tpmif, i) |
++		src = (void *)(idx_to_kaddr(tpmif, i) |
 +			       ((tx->addr & ~PAGE_MASK) + pg_offset));
 +		if (copy_to_buffer(&buffer[offset],
 +				   src, to_copy, isuserbuffer)) {
@@ -66585,7 +66721,7 @@
 +			tpmif->domid, buffer[offset], buffer[offset + 1],
 +			buffer[offset + 2], buffer[offset + 3]);
 +
-+		gnttab_set_unmap_op(&unmap_op, MMAP_VADDR(tpmif, i),
++		gnttab_set_unmap_op(&unmap_op, idx_to_kaddr(tpmif, i),
 +				    GNTMAP_host_map, handle);
 +
 +		if (unlikely
@@ -68552,8 +68688,8 @@
 +}
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/drivers/xen/xenbus/xenbus_probe.c linux-2.6-xen-fedora/drivers/xen/xenbus/xenbus_probe.c
 --- /scratch/src/linux-2.6.18/drivers/xen/xenbus/xenbus_probe.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/xenbus/xenbus_probe.c	2006-09-16 01:08:18.000000000 +0200
-@@ -0,0 +1,1176 @@
++++ linux-2.6-xen-fedora/drivers/xen/xenbus/xenbus_probe.c	2006-10-13 04:38:08.000000000 +0200
+@@ -0,0 +1,1190 @@
 +/******************************************************************************
 + * Talks to Xen Store to figure out what devices we have.
 + *
@@ -68879,6 +69015,20 @@
 +	DPRINTK("state is %d (%s), %s, %s", state, xenbus_strstate(state),
 +		dev->otherend_watch.node, vec[XS_WATCH_PATH]);
 +
++	/*
++	 * Ignore xenbus transitions during shutdown. This prevents us doing
++	 * work that can fail e.g., when the rootfs is gone.
++	 */
++	if (system_state > SYSTEM_RUNNING) {
++		struct xen_bus_type *bus = bus;
++		bus = container_of(dev->dev.bus, struct xen_bus_type, bus);
++		/* If we're frontend, drive the state machine to Closed. */
++		/* This should cause the backend to release our resources. */
++		if ((bus == &xenbus_frontend) && (state == XenbusStateClosing))
++			xenbus_frontend_closed(dev);
++		return;
++	}
++
 +	if (drv->otherend_changed)
 +		drv->otherend_changed(dev, state);
 +}
@@ -85021,8 +85171,8 @@
   *	dev_alloc_skb - allocate an skbuff for receiving
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/include/xen/balloon.h linux-2.6-xen-fedora/include/xen/balloon.h
 --- /scratch/src/linux-2.6.18/include/xen/balloon.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/balloon.h	2006-08-30 19:39:13.000000000 +0200
-@@ -0,0 +1,67 @@
++++ linux-2.6-xen-fedora/include/xen/balloon.h	2006-10-13 04:38:08.000000000 +0200
+@@ -0,0 +1,57 @@
 +/******************************************************************************
 + * balloon.h
 + *
@@ -85063,23 +85213,13 @@
 + * Inform the balloon driver that it should allow some slop for device-driver
 + * memory activities.
 + */
-+void
-+balloon_update_driver_allowance(
-+	long delta);
++void balloon_update_driver_allowance(long delta);
 +
-+/* Allocate an empty low-memory page range. */
-+struct page *
-+balloon_alloc_empty_page_range(
-+	unsigned long nr_pages);
++/* Allocate/free a set of empty pages in low memory (i.e., no RAM mapped). */
++struct page **alloc_empty_pages_and_pagevec(int nr_pages);
++void free_empty_pages_and_pagevec(struct page **pagevec, int nr_pages);
 +
-+/* Deallocate an empty page range, adding to the balloon. */
-+void
-+balloon_dealloc_empty_page_range(
-+	struct page *page, unsigned long nr_pages);
-+
-+void
-+balloon_release_driver_page(
-+	struct page *page);
++void balloon_release_driver_page(struct page *page);
 +
 +/*
 + * Prevent the balloon driver from changing the memory reservation during
@@ -89033,7 +89173,7 @@
 +#endif /* __XEN_PCI_COMMON_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/include/xen/interface/io/ring.h linux-2.6-xen-fedora/include/xen/interface/io/ring.h
 --- /scratch/src/linux-2.6.18/include/xen/interface/io/ring.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/interface/io/ring.h	2006-07-26 16:46:37.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/interface/io/ring.h	2006-10-13 04:38:08.000000000 +0200
 @@ -0,0 +1,273 @@
 +/******************************************************************************
 + * ring.h
@@ -89062,7 +89202,7 @@
 + * power of two (so we can mask with (size-1) to loop around).
 + */
 +#define __RING_SIZE(_s, _sz) \
-+    (__RD32(((_sz) - (long)&(_s)->ring + (long)(_s)) / sizeof((_s)->ring[0])))
++    (__RD32(((_sz) - (long)(_s)->ring + (long)(_s)) / sizeof((_s)->ring[0])))
 +
 +/*
 + * Macros to make the correct C datatypes for a new kind of ring.
@@ -91521,8 +91661,8 @@
 +#endif /* __XEN_ASM_PCIFRONT_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/include/xen/public/evtchn.h linux-2.6-xen-fedora/include/xen/public/evtchn.h
 --- /scratch/src/linux-2.6.18/include/xen/public/evtchn.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/public/evtchn.h	2006-07-26 16:46:37.000000000 +0200
-@@ -0,0 +1,91 @@
++++ linux-2.6-xen-fedora/include/xen/public/evtchn.h	2006-10-13 04:38:08.000000000 +0200
+@@ -0,0 +1,88 @@
 +/******************************************************************************
 + * evtchn.h
 + * 
@@ -91558,9 +91698,6 @@
 +#ifndef __LINUX_PUBLIC_EVTCHN_H__
 +#define __LINUX_PUBLIC_EVTCHN_H__
 +
-+/* /dev/xen/evtchn resides at device number major=10, minor=201 */
-+#define EVTCHN_MINOR 201
-+
 +/*
 + * Bind a fresh port to VIRQ @virq.
 + * Return allocated port.
@@ -92153,17 +92290,26 @@
  #
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
 --- /scratch/src/linux-2.6.18/mm/memory.c	2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-08-30 00:03:21.000000000 +0200
-@@ -390,7 +390,7 @@ struct page *vm_normal_page(struct vm_ar
++++ linux-2.6-xen-fedora/mm/memory.c	2006-10-13 04:38:08.000000000 +0200
+@@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
+ 	 * and that the resulting page looks ok.
+ 	 */
+ 	if (unlikely(!pfn_valid(pfn))) {
+-		print_bad_pte(vma, pte, addr);
++		if (!(vma->vm_flags & VM_RESERVED))
++			print_bad_pte(vma, pte, addr);
+ 		return NULL;
+ 	}
  
- 	if (unlikely(vma->vm_flags & VM_PFNMAP)) {
- 		unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT;
--		if (pfn == vma->vm_pgoff + off)
-+		if ((pfn == vma->vm_pgoff + off) || !pfn_valid(pfn))
- 			return NULL;
- 		if (!is_cow_mapping(vma->vm_flags))
- 			return NULL;
-@@ -1030,6 +1030,26 @@ int get_user_pages(struct task_struct *t
+@@ -891,6 +892,7 @@ unsigned long zap_page_range(struct vm_a
+ 		tlb_finish_mmu(tlb, address, end);
+ 	return end;
+ }
++EXPORT_SYMBOL(zap_page_range);
+ 
+ /*
+  * Do a quick page-table lookup for a single page.
+@@ -1030,6 +1032,26 @@ int get_user_pages(struct task_struct *t
  			continue;
  		}
  
@@ -92190,7 +92336,7 @@
  		if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
  				|| !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1369,6 +1389,102 @@ int remap_pfn_range(struct vm_area_struc
+@@ -1369,6 +1391,102 @@ int remap_pfn_range(struct vm_area_struc
  }
  EXPORT_SYMBOL(remap_pfn_range);
  


--- linux-2.6-xen-blktap-cleanup.patch DELETED ---


--- linux-2.6-xen-blktap-dynamic-major.patch DELETED ---


--- linux-2.6-xen-blktap-fixes.patch DELETED ---


--- linux-2.6-xen-blktap-sysfs.patch DELETED ---




More information about the fedora-cvs-commits mailing list