rpms/kernel/FC-5 kernel-2.6.spec, 1.2108, 1.2109 linux-2.6-xen.patch, 1.9, 1.10
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 4 17:05:28 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19869
Modified Files:
kernel-2.6.spec linux-2.6-xen.patch
Log Message:
Revert broken Xen update that sneaked into the last update.
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2108
retrieving revision 1.2109
diff -u -r1.2108 -r1.2109
--- kernel-2.6.spec 4 May 2006 00:47:12 -0000 1.2108
+++ kernel-2.6.spec 4 May 2006 17:04:11 -0000 1.2109
@@ -1684,8 +1684,11 @@
%endif
%changelog
+* Thu May 4 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2109_FC5]
+- Revert broken Xen update that sneaked into the last update.
+
* Wed May 3 2006 Dave Jones <davej at redhat.com>
-- Experiment: disable MSI again.
+- disable MSI until 2.6.17.
* Tue May 2 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2107_FC5]
- 2.6.16.13
linux-2.6-xen.patch:
linux-2.6.16-rc5-xen0/arch/i386/Kconfig | 98
linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu | 2
linux-2.6.16-rc5-xen0/arch/i386/Makefile | 18
linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile | 21
linux-2.6.16-rc5-xen0/arch/i386/kernel/Makefile | 33
linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile | 4
linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c | 1161 ++++
linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c | 140
linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c | 5
linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile | 5
linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c | 719 ++
linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/Makefile | 7
linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c | 187
linux-2.6.16-rc5-xen0/arch/i386/kernel/early_printk-xen.c | 2
linux-2.6.16-rc5-xen0/arch/i386/kernel/entry-xen.S | 857 +++
linux-2.6.16-rc5-xen0/arch/i386/kernel/fixup.c | 95
linux-2.6.16-rc5-xen0/arch/i386/kernel/head-xen.S | 173
linux-2.6.16-rc5-xen0/arch/i386/kernel/init_task-xen.c | 51
linux-2.6.16-rc5-xen0/arch/i386/kernel/io_apic-xen.c | 2730 ++++++++++
linux-2.6.16-rc5-xen0/arch/i386/kernel/ioport-xen.c | 122
linux-2.6.16-rc5-xen0/arch/i386/kernel/irq-xen.c | 306 +
linux-2.6.16-rc5-xen0/arch/i386/kernel/ldt-xen.c | 269
linux-2.6.16-rc5-xen0/arch/i386/kernel/microcode-xen.c | 164
linux-2.6.16-rc5-xen0/arch/i386/kernel/mpparse-xen.c | 1188 ++++
linux-2.6.16-rc5-xen0/arch/i386/kernel/pci-dma-xen.c | 344 +
linux-2.6.16-rc5-xen0/arch/i386/kernel/process-xen.c | 833 +++
linux-2.6.16-rc5-xen0/arch/i386/kernel/quirks-xen.c | 48
linux-2.6.16-rc5-xen0/arch/i386/kernel/setup-xen.c | 1888 ++++++
linux-2.6.16-rc5-xen0/arch/i386/kernel/smp-xen.c | 617 ++
linux-2.6.16-rc5-xen0/arch/i386/kernel/swiotlb.c | 674 ++
linux-2.6.16-rc5-xen0/arch/i386/kernel/sysenter.c | 90
linux-2.6.16-rc5-xen0/arch/i386/kernel/time-xen.c | 1067 +++
linux-2.6.16-rc5-xen0/arch/i386/kernel/traps-xen.c | 1094 ++++
linux-2.6.16-rc5-xen0/arch/i386/kernel/vm86.c | 8
linux-2.6.16-rc5-xen0/arch/i386/kernel/vmlinux.lds.S | 4
linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall-note-xen.S | 32
linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall.S | 2
linux-2.6.16-rc5-xen0/arch/i386/mach-xen/Makefile | 5
linux-2.6.16-rc5-xen0/arch/i386/mach-xen/setup.c | 37
linux-2.6.16-rc5-xen0/arch/i386/mm/Makefile | 8
linux-2.6.16-rc5-xen0/arch/i386/mm/fault-xen.c | 617 ++
linux-2.6.16-rc5-xen0/arch/i386/mm/highmem-xen.c | 123
linux-2.6.16-rc5-xen0/arch/i386/mm/hypervisor.c | 471 +
linux-2.6.16-rc5-xen0/arch/i386/mm/init-xen.c | 846 +++
linux-2.6.16-rc5-xen0/arch/i386/mm/ioremap-xen.c | 462 +
linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable-xen.c | 646 ++
linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable.c | 62
linux-2.6.16-rc5-xen0/arch/i386/pci/Makefile | 9
linux-2.6.16-rc5-xen0/arch/i386/pci/irq-xen.c | 1202 ++++
linux-2.6.16-rc5-xen0/arch/i386/pci/pcifront.c | 55
linux-2.6.16-rc5-xen0/arch/i386/power/Makefile | 4
linux-2.6.16-rc5-xen0/arch/ia64/Kconfig | 43
linux-2.6.16-rc5-xen0/arch/ia64/Makefile | 10
linux-2.6.16-rc5-xen0/arch/ia64/hp/sim/Makefile | 2
linux-2.6.16-rc5-xen0/arch/ia64/kernel/entry.S | 32
linux-2.6.16-rc5-xen0/arch/ia64/kernel/head.S | 4
linux-2.6.16-rc5-xen0/arch/ia64/kernel/pal.S | 5
linux-2.6.16-rc5-xen0/arch/ia64/kernel/sal.c | 3
linux-2.6.16-rc5-xen0/arch/ia64/kernel/setup.c | 4
linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-post | 2
linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-pre | 50
linux-2.6.16-rc5-xen0/arch/ia64/xen/Makefile | 5
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/Makefile | 20
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/README | 2
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/coreMakefile | 24
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/evtchn_ia64.c | 266
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/blkback.c.patch | 33
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/console.c.patch | 11
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/devmem.c.patch | 2
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/gnttab.c.patch | 33
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/privcmd.c.patch | 30
linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/xenia64_init.c | 55
linux-2.6.16-rc5-xen0/arch/ia64/xen/hypercall.S | 323 +
linux-2.6.16-rc5-xen0/arch/ia64/xen/xen_ksyms.c | 12
linux-2.6.16-rc5-xen0/arch/ia64/xen/xenconsole.c | 19
linux-2.6.16-rc5-xen0/arch/ia64/xen/xenentry.S | 850 +++
linux-2.6.16-rc5-xen0/arch/ia64/xen/xenhpski.c | 19
linux-2.6.16-rc5-xen0/arch/ia64/xen/xenivt.S | 2044 +++++++
linux-2.6.16-rc5-xen0/arch/ia64/xen/xenminstate.h | 367 +
linux-2.6.16-rc5-xen0/arch/ia64/xen/xenpal.S | 73
linux-2.6.16-rc5-xen0/arch/ia64/xen/xensetup.S | 33
linux-2.6.16-rc5-xen0/arch/um/kernel/physmem.c | 4
linux-2.6.16-rc5-xen0/arch/x86_64/Kconfig | 60
linux-2.6.16-rc5-xen0/arch/x86_64/Makefile | 16
linux-2.6.16-rc5-xen0/arch/x86_64/ia32/ia32entry-xen.S | 721 ++
linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32-xen.c | 128
linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S | 28
linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-int80.S | 58
linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-sigreturn.S | 2
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/Makefile | 18
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/acpi/Makefile | 1
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/apic-xen.c | 200
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/asm-offsets.c | 2
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/e820-xen.c | 744 ++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/early_printk-xen.c | 306 +
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/entry-xen.S | 1140 ++++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic-xen.c | 144
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic_xen.c | 162
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head-xen.S | 156
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head64-xen.c | 140
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/init_task.c | 3
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ioport-xen.c | 58
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/irq-xen.c | 168
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ldt-xen.c | 282 +
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/mpparse-xen.c | 1005 +++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/pci-swiotlb-xen.c | 54
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/process-xen.c | 810 ++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup-xen.c | 1635 +++++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup64-xen.c | 360 +
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/smp-xen.c | 596 ++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/traps-xen.c | 1023 +++
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/vsyscall-xen.c | 239
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/x8664_ksyms-xen.c | 172
linux-2.6.16-rc5-xen0/arch/x86_64/kernel/xen_entry.S | 41
linux-2.6.16-rc5-xen0/arch/x86_64/mm/Makefile | 10
linux-2.6.16-rc5-xen0/arch/x86_64/mm/fault-xen.c | 595 ++
linux-2.6.16-rc5-xen0/arch/x86_64/mm/init-xen.c | 1107 ++++
linux-2.6.16-rc5-xen0/arch/x86_64/mm/pageattr-xen.c | 392 +
linux-2.6.16-rc5-xen0/arch/x86_64/pci/Makefile | 12
linux-2.6.16-rc5-xen0/drivers/Makefile | 1
linux-2.6.16-rc5-xen0/drivers/acpi/Kconfig | 3
linux-2.6.16-rc5-xen0/drivers/acpi/tables.c | 7
linux-2.6.16-rc5-xen0/drivers/char/mem.c | 6
linux-2.6.16-rc5-xen0/drivers/char/tpm/Kconfig | 14
linux-2.6.16-rc5-xen0/drivers/char/tpm/Makefile | 1
linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.c | 44
linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.h | 7
linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm_xen.c | 536 +
linux-2.6.16-rc5-xen0/drivers/char/tty_io.c | 7
linux-2.6.16-rc5-xen0/drivers/firmware/Kconfig | 2
linux-2.6.16-rc5-xen0/drivers/pci/Kconfig | 1
linux-2.6.16-rc5-xen0/drivers/serial/Kconfig | 1
linux-2.6.16-rc5-xen0/drivers/video/Kconfig | 2
linux-2.6.16-rc5-xen0/drivers/xen/Kconfig | 200
linux-2.6.16-rc5-xen0/drivers/xen/Makefile | 22
linux-2.6.16-rc5-xen0/drivers/xen/balloon/Makefile | 2
linux-2.6.16-rc5-xen0/drivers/xen/balloon/balloon.c | 585 ++
linux-2.6.16-rc5-xen0/drivers/xen/blkback/Makefile | 3
linux-2.6.16-rc5-xen0/drivers/xen/blkback/blkback.c | 596 ++
linux-2.6.16-rc5-xen0/drivers/xen/blkback/common.h | 123
linux-2.6.16-rc5-xen0/drivers/xen/blkback/interface.c | 164
linux-2.6.16-rc5-xen0/drivers/xen/blkback/vbd.c | 102
linux-2.6.16-rc5-xen0/drivers/xen/blkback/xenbus.c | 421 +
linux-2.6.16-rc5-xen0/drivers/xen/blkfront/Makefile | 5
linux-2.6.16-rc5-xen0/drivers/xen/blkfront/blkfront.c | 834 +++
linux-2.6.16-rc5-xen0/drivers/xen/blkfront/block.h | 162
linux-2.6.16-rc5-xen0/drivers/xen/blkfront/vbd.c | 323 +
linux-2.6.16-rc5-xen0/drivers/xen/blktap/Makefile | 3
linux-2.6.16-rc5-xen0/drivers/xen/blktap/blktap.c | 910 +++
linux-2.6.16-rc5-xen0/drivers/xen/blktap/common.h | 110
linux-2.6.16-rc5-xen0/drivers/xen/blktap/interface.c | 146
linux-2.6.16-rc5-xen0/drivers/xen/blktap/xenbus.c | 234
linux-2.6.16-rc5-xen0/drivers/xen/char/Makefile | 2
linux-2.6.16-rc5-xen0/drivers/xen/char/mem.c | 156
linux-2.6.16-rc5-xen0/drivers/xen/console/Makefile | 2
linux-2.6.16-rc5-xen0/drivers/xen/console/console.c | 647 ++
linux-2.6.16-rc5-xen0/drivers/xen/console/xencons_ring.c | 125
linux-2.6.16-rc5-xen0/drivers/xen/core/Makefile | 9
linux-2.6.16-rc5-xen0/drivers/xen/core/evtchn.c | 823 +++
linux-2.6.16-rc5-xen0/drivers/xen/core/features.c | 29
linux-2.6.16-rc5-xen0/drivers/xen/core/gnttab.c | 429 +
linux-2.6.16-rc5-xen0/drivers/xen/core/reboot.c | 442 +
linux-2.6.16-rc5-xen0/drivers/xen/core/skbuff.c | 144
linux-2.6.16-rc5-xen0/drivers/xen/core/smpboot.c | 464 +
linux-2.6.16-rc5-xen0/drivers/xen/core/xen_proc.c | 29
linux-2.6.16-rc5-xen0/drivers/xen/evtchn/Makefile | 2
linux-2.6.16-rc5-xen0/drivers/xen/evtchn/evtchn.c | 459 +
linux-2.6.16-rc5-xen0/drivers/xen/net_driver_util.c | 68
linux-2.6.16-rc5-xen0/drivers/xen/netback/Makefile | 5
linux-2.6.16-rc5-xen0/drivers/xen/netback/common.h | 110
linux-2.6.16-rc5-xen0/drivers/xen/netback/interface.c | 320 +
linux-2.6.16-rc5-xen0/drivers/xen/netback/loopback.c | 231
linux-2.6.16-rc5-xen0/drivers/xen/netback/netback.c | 835 +++
linux-2.6.16-rc5-xen0/drivers/xen/netback/xenbus.c | 327 +
linux-2.6.16-rc5-xen0/drivers/xen/netfront/Makefile | 4
linux-2.6.16-rc5-xen0/drivers/xen/netfront/netfront.c | 1504 +++++
linux-2.6.16-rc5-xen0/drivers/xen/pciback/Makefile | 10
linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.c | 324 +
linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.h | 97
linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space_header.c | 269
linux-2.6.16-rc5-xen0/drivers/xen/pciback/passthrough.c | 116
linux-2.6.16-rc5-xen0/drivers/xen/pciback/pci_stub.c | 377 +
linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback.h | 73
linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback_ops.c | 84
linux-2.6.16-rc5-xen0/drivers/xen/pciback/vpci.c | 163
linux-2.6.16-rc5-xen0/drivers/xen/pciback/xenbus.c | 439 +
linux-2.6.16-rc5-xen0/drivers/xen/pcifront/Makefile | 7
linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci.c | 44
linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci_op.c | 245
linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pcifront.h | 40
linux-2.6.16-rc5-xen0/drivers/xen/pcifront/xenbus.c | 295 +
linux-2.6.16-rc5-xen0/drivers/xen/privcmd/Makefile | 2
linux-2.6.16-rc5-xen0/drivers/xen/privcmd/privcmd.c | 302 +
linux-2.6.16-rc5-xen0/drivers/xen/tpmback/Makefile | 4
linux-2.6.16-rc5-xen0/drivers/xen/tpmback/common.h | 91
linux-2.6.16-rc5-xen0/drivers/xen/tpmback/interface.c | 203
linux-2.6.16-rc5-xen0/drivers/xen/tpmback/tpmback.c | 1118 ++++
linux-2.6.16-rc5-xen0/drivers/xen/tpmback/xenbus.c | 333 +
linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/Makefile | 2
linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.c | 729 ++
linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.h | 40
linux-2.6.16-rc5-xen0/drivers/xen/util.c | 80
linux-2.6.16-rc5-xen0/drivers/xen/xenbus/Makefile | 8
linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_client.c | 403 +
linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.c | 203
linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.h | 50
linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_dev.c | 238
linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_probe.c | 1015 +++
linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_xs.c | 821 +++
linux-2.6.16-rc5-xen0/fs/Kconfig | 1
linux-2.6.16-rc5-xen0/include/asm-i386/a.out.h | 2
linux-2.6.16-rc5-xen0/include/asm-i386/apic.h | 2
linux-2.6.16-rc5-xen0/include/asm-i386/elf.h | 7
linux-2.6.16-rc5-xen0/include/asm-i386/fixmap.h | 13
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/agp.h | 37
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/desc.h | 164
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/dma-mapping.h | 156
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/fixmap.h | 158
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/floppy.h | 147
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/highmem.h | 81
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hw_irq.h | 73
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypercall.h | 323 +
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypervisor.h | 163
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/io.h | 401 +
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/kmap_types.h | 32
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu.h | 21
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu_context.h | 105
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/page.h | 326 +
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/param.h | 24
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pci.h | 154
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgalloc.h | 64
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level.h | 83
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level.h | 181
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable.h | 512 +
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/processor.h | 762 ++
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/ptrace.h | 90
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/scatterlist.h | 22
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/segment.h | 117
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/setup.h | 66
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/smp.h | 103
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/spinlock.h | 217
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/swiotlb.h | 43
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/synch_bitops.h | 141
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/system.h | 679 ++
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/tlbflush.h | 102
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/vga.h | 20
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/irq_vectors.h | 125
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/mach_traps.h | 33
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_post.h | 50
linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_pre.h | 5
linux-2.6.16-rc5-xen0/include/asm-i386/page.h | 4
linux-2.6.16-rc5-xen0/include/asm-i386/spinlock.h | 6
linux-2.6.16-rc5-xen0/include/asm-i386/system.h | 2
linux-2.6.16-rc5-xen0/include/asm-ia64/fixmap.h | 2
linux-2.6.16-rc5-xen0/include/asm-ia64/gcc_intrin.h | 60
linux-2.6.16-rc5-xen0/include/asm-ia64/hypercall.h | 500 +
linux-2.6.16-rc5-xen0/include/asm-ia64/hypervisor.h | 70
linux-2.6.16-rc5-xen0/include/asm-ia64/intel_intrin.h | 68
linux-2.6.16-rc5-xen0/include/asm-ia64/pal.h | 1
linux-2.6.16-rc5-xen0/include/asm-ia64/privop.h | 59
linux-2.6.16-rc5-xen0/include/asm-ia64/processor.h | 1
linux-2.6.16-rc5-xen0/include/asm-ia64/synch_bitops.h | 61
linux-2.6.16-rc5-xen0/include/asm-ia64/system.h | 4
linux-2.6.16-rc5-xen0/include/asm-ia64/xen/privop.h | 272
linux-2.6.16-rc5-xen0/include/asm-um/page.h | 2
linux-2.6.16-rc5-xen0/include/asm-x86_64/apic.h | 2
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/bootsetup.h | 42
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/desc.h | 263
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/fixmap.h | 111
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/floppy.h | 206
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hw_irq.h | 141
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypercall.h | 323 +
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/io.h | 359 +
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/irq.h | 39
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu.h | 33
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu_context.h | 134
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/nmi.h | 75
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/page.h | 317 +
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pci.h | 174
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgalloc.h | 199
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/processor.h | 503 +
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/ptrace.h | 125
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/smp.h | 152
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/system.h | 434 +
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/timer.h | 67
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/tlbflush.h | 104
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/vga.h | 20
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/xor.h | 328 +
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/irq_vectors.h | 123
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_time.h | 122
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_timer.h | 48
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_post.h | 52
linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
linux-2.6.16-rc5-xen0/include/linux/gfp.h | 6
linux-2.6.16-rc5-xen0/include/linux/highmem.h | 6
linux-2.6.16-rc5-xen0/include/linux/irq.h | 3
linux-2.6.16-rc5-xen0/include/linux/mm.h | 13
linux-2.6.16-rc5-xen0/include/linux/skbuff.h | 13
linux-2.6.16-rc5-xen0/include/xen/balloon.h | 70
linux-2.6.16-rc5-xen0/include/xen/driver_util.h | 26
linux-2.6.16-rc5-xen0/include/xen/evtchn.h | 123
linux-2.6.16-rc5-xen0/include/xen/features.h | 20
linux-2.6.16-rc5-xen0/include/xen/foreign_page.h | 40
linux-2.6.16-rc5-xen0/include/xen/gnttab.h | 120
linux-2.6.16-rc5-xen0/include/xen/interface/COPYING | 28
linux-2.6.16-rc5-xen0/include/xen/interface/acm.h | 181
linux-2.6.16-rc5-xen0/include/xen/interface/acm_ops.h | 96
linux-2.6.16-rc5-xen0/include/xen/interface/arch-ia64.h | 314 +
linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_32.h | 158
linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_64.h | 243
linux-2.6.16-rc5-xen0/include/xen/interface/dom0_ops.h | 488 +
linux-2.6.16-rc5-xen0/include/xen/interface/event_channel.h | 203
linux-2.6.16-rc5-xen0/include/xen/interface/features.h | 53
linux-2.6.16-rc5-xen0/include/xen/interface/grant_table.h | 306 +
linux-2.6.16-rc5-xen0/include/xen/interface/hvm/hvm_info_table.h | 24
linux-2.6.16-rc5-xen0/include/xen/interface/hvm/ioreq.h | 93
linux-2.6.16-rc5-xen0/include/xen/interface/hvm/vmx_assist.h | 97
linux-2.6.16-rc5-xen0/include/xen/interface/io/blkif.h | 85
linux-2.6.16-rc5-xen0/include/xen/interface/io/console.h | 33
linux-2.6.16-rc5-xen0/include/xen/interface/io/netif.h | 76
linux-2.6.16-rc5-xen0/include/xen/interface/io/pciif.h | 55
linux-2.6.16-rc5-xen0/include/xen/interface/io/ring.h | 270
linux-2.6.16-rc5-xen0/include/xen/interface/io/tpmif.h | 56
linux-2.6.16-rc5-xen0/include/xen/interface/io/xenbus.h | 44
linux-2.6.16-rc5-xen0/include/xen/interface/io/xs_wire.h | 97
linux-2.6.16-rc5-xen0/include/xen/interface/memory.h | 153
linux-2.6.16-rc5-xen0/include/xen/interface/nmi.h | 54
linux-2.6.16-rc5-xen0/include/xen/interface/physdev.h | 70
linux-2.6.16-rc5-xen0/include/xen/interface/sched.h | 60
linux-2.6.16-rc5-xen0/include/xen/interface/sched_ctl.h | 68
linux-2.6.16-rc5-xen0/include/xen/interface/trace.h | 90
linux-2.6.16-rc5-xen0/include/xen/interface/vcpu.h | 119
linux-2.6.16-rc5-xen0/include/xen/interface/version.h | 64
linux-2.6.16-rc5-xen0/include/xen/interface/xen.h | 463 +
linux-2.6.16-rc5-xen0/include/xen/net_driver_util.h | 56
linux-2.6.16-rc5-xen0/include/xen/pcifront.h | 39
linux-2.6.16-rc5-xen0/include/xen/public/evtchn.h | 98
linux-2.6.16-rc5-xen0/include/xen/public/privcmd.h | 91
linux-2.6.16-rc5-xen0/include/xen/public/xenstored.h | 89
linux-2.6.16-rc5-xen0/include/xen/tpmfe.h | 40
linux-2.6.16-rc5-xen0/include/xen/xen_proc.h | 23
linux-2.6.16-rc5-xen0/include/xen/xenbus.h | 298 +
linux-2.6.16-rc5-xen0/include/xen/xencons.h | 14
linux-2.6.16-rc5-xen0/kernel/Kconfig.preempt | 1
linux-2.6.16-rc5-xen0/kernel/irq/manage.c | 84
linux-2.6.16-rc5-xen0/lib/Kconfig.debug | 2
linux-2.6.16-rc5-xen0/lib/Makefile | 3
linux-2.6.16-rc5-xen0/mm/Kconfig | 3
linux-2.6.16-rc5-xen0/mm/highmem.c | 11
linux-2.6.16-rc5-xen0/mm/memory.c | 112
linux-2.6.16-rc5-xen0/mm/mmap.c | 4
linux-2.6.16-rc5-xen0/mm/page_alloc.c | 6
linux-2.6.16-rc5-xen0/net/core/dev.c | 50
linux-2.6.16-rc5-xen0/net/core/skbuff.c | 41
linux-2.6.16-rc5-xen0/scripts/Makefile.xen | 14
linux-2.6.16.noarch/arch/x86_64/ia32/Makefile | 21
364 files changed, 77454 insertions(+), 245 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.9 -r 1.10 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-xen.patch 2 May 2006 01:35:15 -0000 1.9
+++ linux-2.6-xen.patch 4 May 2006 17:04:25 -0000 1.10
@@ -1,6 +1,6 @@
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/boot-xen/Makefile linux-2.6.16-xen/arch/i386/boot-xen/Makefile
---- ref-linux-2.6.16/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/boot-xen/Makefile 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile
+--- ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile 2006-03-01 11:09:36.000000000 -0500
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
+ install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+ install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/Kconfig linux-2.6.16-xen/arch/i386/Kconfig
---- ref-linux-2.6.16/arch/i386/Kconfig 2006-04-26 19:12:45.000000000 +0200
-+++ linux-2.6.16-xen/arch/i386/Kconfig 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig linux-2.6.16-rc5-xen0/arch/i386/Kconfig
+--- ref-linux-2.6.16-rc5/arch/i386/Kconfig 2006-03-01 11:12:36.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig 2006-03-01 11:09:36.000000000 -0500
@@ -58,6 +58,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -329,9 +329,9 @@
config KTIME_SCALAR
bool
default y
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/Kconfig.cpu linux-2.6.16-xen/arch/i386/Kconfig.cpu
---- ref-linux-2.6.16/arch/i386/Kconfig.cpu 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/Kconfig.cpu 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu
+--- ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu 2006-03-01 11:12:26.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu 2006-03-01 11:09:36.000000000 -0500
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -341,9 +341,9 @@
default y
config X86_WP_WORKS_OK
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-xen/arch/i386/kernel/acpi/boot-xen.c
---- ref-linux-2.6.16/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/kernel/acpi/boot-xen.c 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c
+--- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c 2006-03-01 11:09:36.000000000 -0500
@@ -0,0 +1,1161 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -391,9 +391,6 @@
+extern int gsi_irq_sharing(int gsi);
+#include <asm/proto.h>
+
-+static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; }
-+
-+
+#else /* X86 */
+
+#ifdef CONFIG_X86_LOCAL_APIC
@@ -1461,6 +1458,9 @@
+ disable_acpi();
+ return error;
+ }
++#ifdef __i386__
++ check_acpi_pci();
++#endif
+
+ acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
+
@@ -1506,9 +1506,9 @@
+
+ return 0;
+}
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/acpi/Makefile linux-2.6.16-xen/arch/i386/kernel/acpi/Makefile
---- ref-linux-2.6.16/arch/i386/kernel/acpi/Makefile 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/kernel/acpi/Makefile 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile
+--- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile 2006-03-01 11:12:26.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile 2006-03-01 11:09:36.000000000 -0500
@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -1517,9 +1517,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/apic-xen.c linux-2.6.16-xen/arch/i386/kernel/apic-xen.c
---- ref-linux-2.6.16/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/kernel/apic-xen.c 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c
+--- ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c 2006-03-01 11:09:36.000000000 -0500
@@ -0,0 +1,140 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1661,9 +1661,9 @@
+
+ return 0;
+}
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/asm-offsets.c linux-2.6.16-xen/arch/i386/kernel/asm-offsets.c
---- ref-linux-2.6.16/arch/i386/kernel/asm-offsets.c 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/kernel/asm-offsets.c 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c
+--- ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c 2006-01-02 22:21:10.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c 2006-03-01 11:09:36.000000000 -0500
@@ -13,6 +13,7 @@
#include <asm/fixmap.h>
#include <asm/processor.h>
@@ -1686,10 +1686,10 @@
- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
}
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-xen/arch/i386/kernel/cpu/common-xen.c
---- ref-linux-2.6.16/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/kernel/cpu/common-xen.c 2006-04-26 18:40:53.000000000 +0200
-@@ -0,0 +1,715 @@
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c
+--- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c 2006-03-01 11:09:36.000000000 -0500
+@@ -0,0 +1,719 @@
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/delay.h>
@@ -1726,6 +1726,8 @@
+
+struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {};
+
++extern void machine_specific_modify_cpu_capabilities(struct cpuinfo_x86 *c);
++
+extern int disable_pse;
+
+static void default_init(struct cpuinfo_x86 * c)
@@ -1973,10 +1975,10 @@
+ c->x86_capability[4] = excap;
+ c->x86 = (tfms >> 8) & 15;
+ c->x86_model = (tfms >> 4) & 15;
-+ if (c->x86 == 0xf)
++ if (c->x86 == 0xf) {
+ c->x86 += (tfms >> 20) & 0xff;
-+ if (c->x86 >= 0x6)
+ c->x86_model += ((tfms >> 16) & 0xF) << 4;
++ }
+ c->x86_mask = tfms & 15;
+ } else {
+ /* Have CPUID level 0 only - unheard of */
@@ -2115,6 +2117,8 @@
+ c->x86_vendor, c->x86_model);
+ }
+
++ machine_specific_modify_cpu_capabilities(c);
++
+ /* Now the feature flags better reflect actual CPU features! */
+
+ printk(KERN_DEBUG "CPU: After all inits, caps:");
@@ -2405,9 +2409,9 @@
+ per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
+}
+#endif
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/cpu/Makefile linux-2.6.16-xen/arch/i386/kernel/cpu/Makefile
---- ref-linux-2.6.16/arch/i386/kernel/cpu/Makefile 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/kernel/cpu/Makefile 2006-04-26 18:40:53.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/Makefile linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile
+--- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/Makefile 2006-01-02 22:21:10.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile 2006-03-01 11:09:36.000000000 -0500
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
@@ -2417,10 +2421,10 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.16-xen/arch/i386/kernel/cpu/mtrr/main-xen.c
---- ref-linux-2.6.16/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-04-26 18:40:53.000000000 +0200
-@@ -0,0 +1,196 @@
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/mtrr/main-xen.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-03-01 11:09:36.000000000 -0500
+@@ -0,0 +1,187 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/ctype.h>
@@ -2431,8 +2435,6 @@
+#include <asm/mtrr.h>
+#include "mtrr.h"
+
-+static DECLARE_MUTEX(mtrr_sem);
-+
+void generic_get_mtrr(unsigned int reg, unsigned long *base,
+ unsigned int *size, mtrr_type * type)
+{
@@ -2488,15 +2490,12 @@
[...18599 lines suppressed...]
+ } while (pud++, addr = next, addr != end);
@@ -82476,8 +80540,8 @@
+ * Scan a region of virtual memory, filling in page tables as necessary
+ * and calling a provided function on each leaf page table.
+ */
-+int apply_to_page_range(struct mm_struct *mm, unsigned long addr,
-+ unsigned long size, pte_fn_t fn, void *data)
++int generic_page_range(struct mm_struct *mm, unsigned long addr,
++ unsigned long size, pte_fn_t fn, void *data)
+{
+ pgd_t *pgd;
+ unsigned long next;
@@ -82488,21 +80552,20 @@
+ pgd = pgd_offset(mm, addr);
+ do {
+ next = pgd_addr_end(addr, end);
-+ err = apply_to_pud_range(mm, pgd, addr, next, fn, data);
++ err = generic_pud_range(mm, pgd, addr, next, fn, data);
+ if (err)
+ break;
+ } while (pgd++, addr = next, addr != end);
+ return err;
+}
-+EXPORT_SYMBOL_GPL(apply_to_page_range);
+#endif
+
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/mm/mmap.c linux-2.6.16-xen/mm/mmap.c
---- ref-linux-2.6.16/mm/mmap.c 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/mm/mmap.c 2006-04-26 18:40:57.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/mmap.c linux-2.6.16-rc5-xen0/mm/mmap.c
+--- ref-linux-2.6.16-rc5/mm/mmap.c 2006-03-01 11:12:31.000000000 -0500
++++ linux-2.6.16-rc5-xen0/mm/mmap.c 2006-03-01 11:09:38.000000000 -0500
@@ -1937,6 +1937,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -82514,9 +80577,9 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/mm/page_alloc.c linux-2.6.16-xen/mm/page_alloc.c
---- ref-linux-2.6.16/mm/page_alloc.c 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/mm/page_alloc.c 2006-04-26 18:40:57.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/page_alloc.c linux-2.6.16-rc5-xen0/mm/page_alloc.c
+--- ref-linux-2.6.16-rc5/mm/page_alloc.c 2006-03-01 11:12:31.000000000 -0500
++++ linux-2.6.16-rc5-xen0/mm/page_alloc.c 2006-03-01 11:09:38.000000000 -0500
@@ -418,7 +418,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -82527,7 +80590,7 @@
if (!PageHighMem(page))
mutex_debug_check_no_locks_freed(page_address(page),
PAGE_SIZE<<order);
-@@ -711,7 +712,8 @@ static void fastcall free_hot_cold_page(
+@@ -712,7 +713,8 @@ static void fastcall free_hot_cold_page(
struct per_cpu_pages *pcp;
unsigned long flags;
@@ -82537,9 +80600,9 @@
if (PageAnon(page))
page->mapping = NULL;
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/net/core/dev.c linux-2.6.16-xen/net/core/dev.c
---- ref-linux-2.6.16/net/core/dev.c 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/net/core/dev.c 2006-04-26 18:40:57.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/dev.c linux-2.6.16-rc5-xen0/net/core/dev.c
+--- ref-linux-2.6.16-rc5/net/core/dev.c 2006-03-01 11:12:32.000000000 -0500
++++ linux-2.6.16-rc5-xen0/net/core/dev.c 2006-03-01 11:09:38.000000000 -0500
@@ -116,6 +116,12 @@
#endif /* CONFIG_NET_RADIO */
#include <asm/current.h>
@@ -82553,19 +80616,20 @@
/*
* The list of packet types we will receive (as opposed to discard)
* and the routines to invoke.
-@@ -1214,6 +1220,43 @@ int __skb_linearize(struct sk_buff *skb,
- } \
- }
+@@ -1260,6 +1266,37 @@ int dev_queue_xmit(struct sk_buff *skb)
+ __skb_linearize(skb, GFP_ATOMIC))
+ goto out_kfree_skb;
+#ifdef CONFIG_XEN
-+inline int skb_checksum_setup(struct sk_buff *skb)
-+{
++ /* If a checksum-deferred packet is forwarded to a device that needs a
++ * checksum, correct the pointers and force checksumming.
++ */
+ if (skb->proto_csum_blank) {
+ if (skb->protocol != htons(ETH_P_IP))
-+ goto out;
++ goto out_kfree_skb;
+ skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
+ if (skb->h.raw >= skb->tail)
-+ goto out;
++ goto out_kfree_skb;
+ switch (skb->nh.iph->protocol) {
+ case IPPROTO_TCP:
+ skb->csum = offsetof(struct tcphdr, check);
@@ -82578,51 +80642,31 @@
+ printk(KERN_ERR "Attempting to checksum a non-"
+ "TCP/UDP packet, dropping a protocol"
+ " %d packet", skb->nh.iph->protocol);
-+ goto out;
++ rc = -EPROTO;
++ goto out_kfree_skb;
+ }
+ if ((skb->h.raw + skb->csum + 2) > skb->tail)
-+ goto out;
++ goto out_kfree_skb;
+ skb->ip_summed = CHECKSUM_HW;
-+ skb->proto_csum_blank = 0;
+ }
-+ return 0;
-+out:
-+ return -EPROTO;
-+}
-+#else
-+inline int skb_checksum_setup(struct sk_buff *skb) {}
+#endif
+
-+
- /**
- * dev_queue_xmit - transmit a buffer
- * @skb: buffer to transmit
-@@ -1260,6 +1303,12 @@ int dev_queue_xmit(struct sk_buff *skb)
- __skb_linearize(skb, GFP_ATOMIC))
- goto out_kfree_skb;
-
-+ /* If a checksum-deferred packet is forwarded to a device that needs a
-+ * checksum, correct the pointers and force checksumming.
-+ */
-+ if(skb_checksum_setup(skb))
-+ goto out_kfree_skb;
-+
/* If packet is not checksummed and device does not support
* checksumming for this protocol, complete checksumming here.
*/
-@@ -1609,6 +1658,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1609,6 +1646,19 @@ int netif_receive_skb(struct sk_buff *sk
}
#endif
+#ifdef CONFIG_XEN
+ switch (skb->ip_summed) {
+ case CHECKSUM_UNNECESSARY:
-+ skb->proto_data_valid = 1;
++ skb->proto_csum_valid = 1;
+ break;
+ case CHECKSUM_HW:
+ /* XXX Implement me. */
+ default:
-+ skb->proto_data_valid = 0;
++ skb->proto_csum_valid = 0;
+ break;
+ }
+#endif
@@ -82630,17 +80674,9 @@
list_for_each_entry_rcu(ptype, &ptype_all, list) {
if (!ptype->dev || ptype->dev == skb->dev) {
if (pt_prev)
-@@ -3300,6 +3362,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
- EXPORT_SYMBOL(net_enable_timestamp);
- EXPORT_SYMBOL(net_disable_timestamp);
- EXPORT_SYMBOL(dev_get_flags);
-+EXPORT_SYMBOL(skb_checksum_setup);
-
- #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
- EXPORT_SYMBOL(br_handle_frame_hook);
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/net/core/skbuff.c linux-2.6.16-xen/net/core/skbuff.c
---- ref-linux-2.6.16/net/core/skbuff.c 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-xen/net/core/skbuff.c 2006-04-26 18:40:57.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/skbuff.c linux-2.6.16-rc5-xen0/net/core/skbuff.c
+--- ref-linux-2.6.16-rc5/net/core/skbuff.c 2006-03-01 11:12:32.000000000 -0500
++++ linux-2.6.16-rc5-xen0/net/core/skbuff.c 2006-03-01 11:09:39.000000000 -0500
@@ -132,6 +132,7 @@ void skb_under_panic(struct sk_buff *skb
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
@@ -82720,15 +80756,15 @@
n->cloned = 1;
n->nohdr = 0;
+#ifdef CONFIG_XEN
-+ C(proto_data_valid);
++ C(proto_csum_valid);
+ C(proto_csum_blank);
+#endif
C(pkt_type);
C(ip_summed);
C(priority);
-diff -Nru -p --exclude='.*' ref-linux-2.6.16/scripts/Makefile.xen linux-2.6.16-xen/scripts/Makefile.xen
---- ref-linux-2.6.16/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-xen/scripts/Makefile.xen 2006-04-26 18:40:57.000000000 +0200
+diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/scripts/Makefile.xen linux-2.6.16-rc5-xen0/scripts/Makefile.xen
+--- ref-linux-2.6.16-rc5/scripts/Makefile.xen 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.16-rc5-xen0/scripts/Makefile.xen 2006-03-01 11:09:39.000000000 -0500
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
More information about the fedora-cvs-commits
mailing list