rpms/kernel/FC-6 kernel-2.6.spec, 1.2897, 1.2898 linux-2.6-xen.patch, 1.83, 1.84
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 22 23:08:41 UTC 2007
Author: quintela
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28099
Modified Files:
kernel-2.6.spec linux-2.6-xen.patch
Log Message:
- update xen kernel patch
* pvfb is now included in it.
* changeset: 43493:67d20a7ca5f9
* update to kernel 2.6.19.2.
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2897
retrieving revision 1.2898
diff -u -r1.2897 -r1.2898
--- kernel-2.6.spec 15 Jan 2007 17:58:03 -0000 1.2897
+++ kernel-2.6.spec 22 Jan 2007 23:08:26 -0000 1.2898
@@ -370,9 +370,6 @@
Patch954: linux-2.6-xen-execshield.patch
Patch955: linux-2.6-xen-tux.patch
Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
-Patch990: linux-2.6-xen-console.patch
-Patch991: linux-2.6-xen-pvfb.patch
-Patch992: linux-2.6-xen-pvfb-fixes.patch
#
# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -900,12 +897,6 @@
%patch955 -p1
# ia64 xen cleanups for kexec/kdump
%patch958 -p1
-
-# xen framebuffer patches
-%patch990 -p1
-%patch991 -p1
-%patch992 -p1
-
%endif
#
@@ -2023,6 +2014,12 @@
%endif
%changelog
+* Tue Jan 23 2007 Juan Quintela <quintela at redhat.com>
+- update xen kernel patch
+ * pvfb is now included in it.
+ * changeset: 43493:67d20a7ca5f9
+ * update to kernel 2.6.19.2.
+
* Mon Jan 15 2007 Markus Armbruster <armbru at redhat.com>
- Update Xen paravirt framebuffer patch to upstream xen-unstable
changeset 13066, less changeset 12680, because that breaks with
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 | 1332 ++++++++
arch/i386/kernel/alternative.c | 11
arch/i386/kernel/apic-xen.c | 223 +
arch/i386/kernel/asm-offsets.c | 7
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 747 +++++
arch/i386/kernel/cpu/mtrr/Makefile | 7
arch/i386/kernel/cpu/mtrr/main-xen.c | 198 +
arch/i386/kernel/early_printk-xen.c | 2
arch/i386/kernel/entry-xen.S | 1254 ++++++++
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 | 2965 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
arch/i386/kernel/irq-xen.c | 328 ++
arch/i386/kernel/ldt-xen.c | 270 +
arch/i386/kernel/microcode-xen.c | 147
arch/i386/kernel/mpparse-xen.c | 1157 +++++++
arch/i386/kernel/pci-dma-xen.c | 376 ++
arch/i386/kernel/process-xen.c | 851 +++++
arch/i386/kernel/quirks-xen.c | 47
arch/i386/kernel/setup-xen.c | 1735 +++++++++++
arch/i386/kernel/smp-xen.c | 631 ++++
arch/i386/kernel/swiotlb.c | 672 ++++
arch/i386/kernel/sysenter.c | 22
arch/i386/kernel/time-xen.c | 1112 +++++++
arch/i386/kernel/traps-xen.c | 1248 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/tsc.c | 2
arch/i386/kernel/vm86.c | 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 | 161 +
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 762 +++++
arch/i386/mm/highmem-xen.c | 121
arch/i386/mm/hypervisor.c | 457 +++
arch/i386/mm/init-xen.c | 879 +++++
arch/i386/mm/ioremap-xen.c | 443 ++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 721 ++++
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 584 +++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1167 +++++++
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 | 260 +
arch/ia64/kernel/pal.S | 3
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 | 847 +++++
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 | 62
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 | 20
arch/x86_64/kernel/acpi/Makefile | 1
arch/x86_64/kernel/apic-xen.c | 254 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/e820-xen.c | 759 +++++
arch/x86_64/kernel/early_printk-xen.c | 299 ++
arch/x86_64/kernel/entry-xen.S | 1217 ++++++++
arch/x86_64/kernel/genapic-xen.c | 143
arch/x86_64/kernel/genapic_xen.c | 190 +
arch/x86_64/kernel/head-xen.S | 189 +
arch/x86_64/kernel/head64-xen.c | 119
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2182 ++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 99
arch/x86_64/kernel/irq.c | 4
arch/x86_64/kernel/irqflags-xen.c | 100
arch/x86_64/kernel/ldt-xen.c | 283 +
arch/x86_64/kernel/mpparse-xen.c | 850 +++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 55
arch/x86_64/kernel/process-xen.c | 859 +++++
arch/x86_64/kernel/setup-xen.c | 1473 +++++++++
arch/x86_64/kernel/setup-xen.c.orig | 1472 +++++++++
arch/x86_64/kernel/setup64-xen.c | 356 ++
arch/x86_64/kernel/smp-xen.c | 571 +++
arch/x86_64/kernel/traps-xen.c | 1245 ++++++++
arch/x86_64/kernel/vmlinux.lds.S | 2
arch/x86_64/kernel/vsyscall-xen.c | 329 ++
arch/x86_64/kernel/xen_entry.S | 40
arch/x86_64/mm/Makefile | 10
arch/x86_64/mm/fault-xen.c | 717 ++++
arch/x86_64/mm/init-xen.c | 1147 +++++++
arch/x86_64/mm/pageattr-xen.c | 396 ++
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 | 1
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 | 3
drivers/serial/Kconfig | 1
drivers/xen/Kconfig | 283 +
drivers/xen/Makefile | 19
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 | 715 ++++
drivers/xen/console/xencons_ring.c | 143
drivers/xen/core/Makefile | 13
drivers/xen/core/cpu_hotplug.c | 188 +
drivers/xen/core/evtchn.c | 840 +++++
drivers/xen/core/features.c | 30
drivers/xen/core/gnttab.c | 483 +++
drivers/xen/core/hypervisor_sysfs.c | 59
drivers/xen/core/reboot.c | 385 ++
drivers/xen/core/skbuff.c | 144
drivers/xen/core/smpboot.c | 442 ++
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/fbfront/Makefile | 2
drivers/xen/fbfront/xenfb.c | 686 ++++
drivers/xen/fbfront/xenkbd.c | 300 ++
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 141
drivers/xen/netback/interface.c | 352 ++
drivers/xen/netback/loopback.c | 320 ++
drivers/xen/netback/netback.c | 1510 ++++++++++
drivers/xen/netback/xenbus.c | 438 ++
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 | 294 +
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 | 300 ++
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 | 1189 ++++++++
drivers/xen/xenbus/xenbus_xs.c | 853 +++++
fs/Kconfig | 1
include/asm-i386/apic.h | 2
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 | 203 +
include/asm-i386/mach-xen/asm/dma-mapping.h | 151 +
include/asm-i386/mach-xen/asm/fixmap.h | 161 +
include/asm-i386/mach-xen/asm/floppy.h | 147
include/asm-i386/mach-xen/asm/highmem.h | 80
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 | 362 ++
include/asm-i386/mach-xen/asm/irqflags.h | 81
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/pci.h | 153 +
include/asm-i386/mach-xen/asm/pgalloc.h | 63
include/asm-i386/mach-xen/asm/pgtable-2level.h | 78
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 24
include/asm-i386/mach-xen/asm/pgtable-3level.h | 195 +
include/asm-i386/mach-xen/asm/pgtable.h | 551 +++
include/asm-i386/mach-xen/asm/processor.h | 737 ++++
include/asm-i386/mach-xen/asm/scatterlist.h | 22
include/asm-i386/mach-xen/asm/segment.h | 132
include/asm-i386/mach-xen/asm/setup.h | 81
include/asm-i386/mach-xen/asm/smp.h | 114
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 | 531 +++
include/asm-i386/mach-xen/asm/timer.h | 67
include/asm-i386/mach-xen/asm/tlbflush.h | 99
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-i386/spinlock.h | 5
include/asm-ia64/agp.h | 31
include/asm-ia64/dma-mapping.h | 98
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 | 219 +
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 | 52
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/dwarf2.h | 2
include/asm-x86_64/ipi.h | 5
include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
include/asm-x86_64/mach-xen/asm/bootsetup.h | 40
include/asm-x86_64/mach-xen/asm/desc.h | 263 +
include/asm-x86_64/mach-xen/asm/dma-mapping.h | 200 +
include/asm-x86_64/mach-xen/asm/dmi.h | 29
include/asm-x86_64/mach-xen/asm/e820.h | 59
include/asm-x86_64/mach-xen/asm/fixmap.h | 109
include/asm-x86_64/mach-xen/asm/floppy.h | 207 +
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 | 300 ++
include/asm-x86_64/mach-xen/asm/irq.h | 34
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 | 410 ++
include/asm-x86_64/mach-xen/asm/nmi.h | 96
include/asm-x86_64/mach-xen/asm/page.h | 213 +
include/asm-x86_64/mach-xen/asm/pci.h | 173 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 224 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 555 +++
include/asm-x86_64/mach-xen/asm/processor.h | 499 +++
include/asm-x86_64/mach-xen/asm/smp.h | 132
include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
include/asm-x86_64/mach-xen/asm/system.h | 266 +
include/asm-x86_64/mach-xen/asm/timer.h | 67
include/asm-x86_64/mach-xen/asm/tlbflush.h | 120
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/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/fbif.h | 116
include/xen/interface/io/kbdif.h | 108
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 | 3
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 | 3
scripts/Makefile.xen | 14
421 files changed, 90718 insertions(+), 200 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.83 -r 1.84 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.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- linux-2.6-xen.patch 24 Dec 2006 00:48:31 -0000 1.83
+++ linux-2.6-xen.patch 22 Jan 2007 23:08:27 -0000 1.84
@@ -1,7 +1,6 @@
- * linux-2.6.19-xen-3.0.3 changeset: 43477:924f1a8f8441
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/boot-xen/Makefile linux-2.6.19-xen-3.0.3/arch/i386/boot-xen/Makefile
---- /scratch/src/linux-2.6.19.1/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/boot-xen/Makefile 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile source/arch/i386/boot-xen/Makefile
+--- /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ source/arch/i386/boot-xen/Makefile 2006-12-23 17:42:12.000000000 +0100
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -24,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 -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/Kconfig linux-2.6.19-xen-3.0.3/arch/i386/Kconfig
---- /scratch/src/linux-2.6.19.1/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/Kconfig 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig source/arch/i386/Kconfig
+--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/Kconfig 2006-12-23 17:44:39.000000000 +0100
@@ -16,6 +16,7 @@ config X86_32
config GENERIC_TIME
@@ -307,9 +306,9 @@
config KTIME_SCALAR
bool
default y
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.cpu linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.cpu
---- /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.cpu 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.cpu 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu source/arch/i386/Kconfig.cpu
+--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/Kconfig.cpu 2006-12-23 17:44:39.000000000 +0100
@@ -252,7 +252,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -326,9 +325,9 @@
- depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
+ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
default y
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.debug linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.debug
---- /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.debug 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug source/arch/i386/Kconfig.debug
+--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/Kconfig.debug 2006-12-23 17:42:12.000000000 +0100
@@ -79,6 +79,7 @@ config X86_MPPARSE
config DOUBLEFAULT
default y
@@ -337,9 +336,9 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/boot-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/boot-xen.c
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/boot-xen.c 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c source/arch/i386/kernel/acpi/boot-xen.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ source/arch/i386/kernel/acpi/boot-xen.c 2006-12-23 17:46:06.000000000 +0100
@@ -0,0 +1,1332 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1673,9 +1672,9 @@
+ return 0;
+}
+early_param("acpi_sci", setup_acpi_sci);
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/Makefile linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/Makefile
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/Makefile 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile source/arch/i386/kernel/acpi/Makefile
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/kernel/acpi/Makefile 2006-12-23 17:44:39.000000000 +0100
@@ -8,3 +8,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -1684,9 +1683,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/alternative.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/alternative.c
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/alternative.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/alternative.c 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c source/arch/i386/kernel/alternative.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/kernel/alternative.c 2006-12-23 17:44:39.000000000 +0100
@@ -4,7 +4,11 @@
#include <asm/alternative.h>
#include <asm/sections.h>
@@ -1724,9 +1723,9 @@
return;
}
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/apic-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/apic-xen.c
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/apic-xen.c 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c source/arch/i386/kernel/apic-xen.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ source/arch/i386/kernel/apic-xen.c 2006-12-23 17:44:39.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1951,9 +1950,9 @@
+}
+early_param("nolapic", parse_nolapic);
+
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/asm-offsets.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/asm-offsets.c
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/asm-offsets.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/asm-offsets.c 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c source/arch/i386/kernel/asm-offsets.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/kernel/asm-offsets.c 2006-12-23 17:42:12.000000000 +0100
@@ -66,9 +66,14 @@ void foo(void)
OFFSET(pbe_orig_address, pbe, orig_address);
OFFSET(pbe_next, pbe, next);
@@ -1970,9 +1969,9 @@
DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
DEFINE(VDSO_PRELINK, VDSO_PRELINK);
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/common-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/common-xen.c
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/common-xen.c 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c source/arch/i386/kernel/cpu/common-xen.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ source/arch/i386/kernel/cpu/common-xen.c 2006-12-23 17:44:39.000000000 +0100
@@ -0,0 +1,747 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -2721,9 +2720,9 @@
+ per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
+}
+#endif
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/Makefile linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/Makefile
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/Makefile 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile source/arch/i386/kernel/cpu/Makefile
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/kernel/cpu/Makefile 2006-12-23 17:42:12.000000000 +0100
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
@@ -2733,9 +2732,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/main-xen.c
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c source/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ source/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-12-23 17:44:39.000000000 +0100
@@ -0,0 +1,198 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -2935,9 +2934,9 @@
+}
+
+subsys_initcall(mtrr_init);
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/Makefile
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/Makefile 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile source/arch/i386/kernel/cpu/mtrr/Makefile
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/kernel/cpu/mtrr/Makefile 2006-12-23 17:42:12.000000000 +0100
@@ -3,3 +3,10 @@ obj-y += amd.o
obj-y += cyrix.o
obj-y += centaur.o
@@ -2949,15 +2948,15 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/early_printk-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/early_printk-xen.c
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/early_printk-xen.c 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c source/arch/i386/kernel/early_printk-xen.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ source/arch/i386/kernel/early_printk-xen.c 2006-12-23 17:42:12.000000000 +0100
@@ -0,0 +1,2 @@
+
+#include "../../x86_64/kernel/early_printk-xen.c"
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/entry.S linux-2.6.19-xen-3.0.3/arch/i386/kernel/entry.S
---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/entry.S 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/entry.S 2006-12-23 18:13:52.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S source/arch/i386/kernel/entry.S
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/kernel/entry.S 2006-12-23 17:44:39.000000000 +0100
@@ -281,7 +281,7 @@ ENTRY(sysenter_entry)
CFI_SIGNAL_FRAME
CFI_DEF_CFA esp, 0
@@ -2985,9 +2984,9 @@
CFI_DEF_CFA esp, 0; \
CFI_UNDEFINED eip; \
[...9123 lines suppressed...]
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/kernel/Kconfig.preempt linux-2.6.19-xen-3.0.3/kernel/Kconfig.preempt
---- /scratch/src/linux-2.6.19.1/kernel/Kconfig.preempt 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/kernel/Kconfig.preempt 2006-12-23 18:14:47.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/kernel/Kconfig.preempt source/kernel/Kconfig.preempt
+--- /scratch/src/linux-2.6.19.2/kernel/Kconfig.preempt 2006-11-29 22:57:37.000000000 +0100
++++ source/kernel/Kconfig.preempt 2006-12-23 17:42:52.000000000 +0100
@@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
config PREEMPT
@@ -91494,9 +94253,9 @@
help
This option reduces the latency of the kernel by making
all kernel code (that is not executing in a critical section)
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/lib/Kconfig.debug linux-2.6.19-xen-3.0.3/lib/Kconfig.debug
---- /scratch/src/linux-2.6.19.1/lib/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/lib/Kconfig.debug 2006-12-23 18:14:48.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Kconfig.debug source/lib/Kconfig.debug
+--- /scratch/src/linux-2.6.19.2/lib/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100
++++ source/lib/Kconfig.debug 2006-12-23 17:44:56.000000000 +0100
@@ -341,7 +341,7 @@ config FRAME_POINTER
config UNWIND_INFO
@@ -91506,9 +94265,9 @@
depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
help
If you say Y here the resulting kernel image will be slightly larger
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/lib/Makefile linux-2.6.19-xen-3.0.3/lib/Makefile
---- /scratch/src/linux-2.6.19.1/lib/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/lib/Makefile 2006-12-23 18:14:48.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Makefile source/lib/Makefile
+--- /scratch/src/linux-2.6.19.2/lib/Makefile 2006-11-29 22:57:37.000000000 +0100
++++ source/lib/Makefile 2006-12-23 17:44:56.000000000 +0100
@@ -54,6 +54,9 @@ obj-$(CONFIG_SMP) += percpu_counter.o
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
@@ -91519,9 +94278,9 @@
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/highmem.c linux-2.6.19-xen-3.0.3/mm/highmem.c
---- /scratch/src/linux-2.6.19.1/mm/highmem.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/mm/highmem.c 2006-12-23 18:14:48.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/highmem.c source/mm/highmem.c
+--- /scratch/src/linux-2.6.19.2/mm/highmem.c 2006-11-29 22:57:37.000000000 +0100
++++ source/mm/highmem.c 2006-12-23 17:44:56.000000000 +0100
@@ -148,6 +148,17 @@ start:
return vaddr;
}
@@ -91540,9 +94299,9 @@
void fastcall *kmap_high(struct page *page)
{
unsigned long vaddr;
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/Kconfig linux-2.6.19-xen-3.0.3/mm/Kconfig
---- /scratch/src/linux-2.6.19.1/mm/Kconfig 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/mm/Kconfig 2006-12-23 18:14:48.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/Kconfig source/mm/Kconfig
+--- /scratch/src/linux-2.6.19.2/mm/Kconfig 2006-11-29 22:57:37.000000000 +0100
++++ source/mm/Kconfig 2006-12-23 17:44:56.000000000 +0100
@@ -132,11 +132,14 @@ config MEMORY_HOTPLUG_SPARSE
# Default to 4 for wider testing, though 8 might be more appropriate.
# ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -91558,9 +94317,9 @@
default "4"
#
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/memory.c linux-2.6.19-xen-3.0.3/mm/memory.c
---- /scratch/src/linux-2.6.19.1/mm/memory.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/mm/memory.c 2006-12-23 18:14:48.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/memory.c source/mm/memory.c
+--- /scratch/src/linux-2.6.19.2/mm/memory.c 2007-01-15 16:07:25.000000000 +0100
++++ source/mm/memory.c 2007-01-22 12:58:23.000000000 +0100
@@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
@@ -91606,7 +94365,7 @@
if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
|| !(vm_flags & vma->vm_flags))
return i ? : -EFAULT;
-@@ -1393,6 +1415,102 @@ int remap_pfn_range(struct vm_area_struc
+@@ -1403,6 +1425,102 @@ int remap_pfn_range(struct vm_area_struc
}
EXPORT_SYMBOL(remap_pfn_range);
@@ -91709,9 +94468,9 @@
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/mmap.c linux-2.6.19-xen-3.0.3/mm/mmap.c
---- /scratch/src/linux-2.6.19.1/mm/mmap.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/mm/mmap.c 2006-12-23 18:14:48.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/mmap.c source/mm/mmap.c
+--- /scratch/src/linux-2.6.19.2/mm/mmap.c 2006-11-29 22:57:37.000000000 +0100
++++ source/mm/mmap.c 2006-12-23 17:44:56.000000000 +0100
@@ -1970,6 +1970,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -91723,9 +94482,9 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/page_alloc.c linux-2.6.19-xen-3.0.3/mm/page_alloc.c
---- /scratch/src/linux-2.6.19.1/mm/page_alloc.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/mm/page_alloc.c 2006-12-23 18:14:48.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/page_alloc.c source/mm/page_alloc.c
+--- /scratch/src/linux-2.6.19.2/mm/page_alloc.c 2006-11-29 22:57:37.000000000 +0100
++++ source/mm/page_alloc.c 2006-12-23 17:44:56.000000000 +0100
@@ -496,6 +496,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -91753,9 +94512,9 @@
if (PageAnon(page))
page->mapping = NULL;
if (free_pages_check(page))
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/core/dev.c linux-2.6.19-xen-3.0.3/net/core/dev.c
---- /scratch/src/linux-2.6.19.1/net/core/dev.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/net/core/dev.c 2006-12-23 18:14:49.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/dev.c source/net/core/dev.c
+--- /scratch/src/linux-2.6.19.2/net/core/dev.c 2006-11-29 22:57:37.000000000 +0100
++++ source/net/core/dev.c 2006-12-23 17:44:56.000000000 +0100
@@ -118,6 +118,12 @@
#include <linux/err.h>
#include <linux/ctype.h>
@@ -91854,9 +94613,9 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/core/skbuff.c linux-2.6.19-xen-3.0.3/net/core/skbuff.c
---- /scratch/src/linux-2.6.19.1/net/core/skbuff.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/net/core/skbuff.c 2006-12-23 18:14:49.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/skbuff.c source/net/core/skbuff.c
+--- /scratch/src/linux-2.6.19.2/net/core/skbuff.c 2006-11-29 22:57:37.000000000 +0100
++++ source/net/core/skbuff.c 2006-12-23 17:44:56.000000000 +0100
@@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
@@ -91927,9 +94686,9 @@
C(pkt_type);
C(ip_summed);
C(priority);
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-23 18:14:51.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c source/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-11-29 22:57:37.000000000 +0100
++++ source/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-23 17:44:57.000000000 +0100
@@ -129,9 +129,16 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
@@ -91947,9 +94706,9 @@
return 1;
}
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_udp.c
---- /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-23 18:14:51.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c source/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-11-29 22:57:37.000000000 +0100
++++ source/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-23 17:44:57.000000000 +0100
@@ -115,11 +115,18 @@ udp_manip_pkt(struct sk_buff **pskb,
}
@@ -91969,9 +94728,9 @@
if (!hdr->check)
hdr->check = -1;
}
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv4/xfrm4_output.c linux-2.6.19-xen-3.0.3/net/ipv4/xfrm4_output.c
---- /scratch/src/linux-2.6.19.1/net/ipv4/xfrm4_output.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/net/ipv4/xfrm4_output.c 2006-12-23 18:14:51.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c source/net/ipv4/xfrm4_output.c
+--- /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c 2006-11-29 22:57:37.000000000 +0100
++++ source/net/ipv4/xfrm4_output.c 2006-12-23 17:44:57.000000000 +0100
@@ -18,6 +18,8 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -91992,9 +94751,9 @@
if (skb->ip_summed == CHECKSUM_PARTIAL) {
err = skb_checksum_help(skb);
if (err)
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv6/addrconf.c linux-2.6.19-xen-3.0.3/net/ipv6/addrconf.c
---- /scratch/src/linux-2.6.19.1/net/ipv6/addrconf.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/net/ipv6/addrconf.c 2006-12-23 18:14:51.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c source/net/ipv6/addrconf.c
+--- /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c 2007-01-15 16:07:25.000000000 +0100
++++ source/net/ipv6/addrconf.c 2007-01-22 12:58:23.000000000 +0100
@@ -2545,6 +2545,8 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
@@ -92012,9 +94771,9 @@
(ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
struct in6_addr all_routers;
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/scripts/Makefile.xen linux-2.6.19-xen-3.0.3/scripts/Makefile.xen
---- /scratch/src/linux-2.6.19.1/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19-xen-3.0.3/scripts/Makefile.xen 2006-12-23 18:14:53.000000000 +0100
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/scripts/Makefile.xen source/scripts/Makefile.xen
+--- /scratch/src/linux-2.6.19.2/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
++++ source/scripts/Makefile.xen 2006-12-23 17:42:55.000000000 +0100
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
More information about the fedora-cvs-commits
mailing list