|
|
Author: quintela
Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv922
Modified Files:
kernel-2.6.spec linux-2.6-xen-compile-fixes.patch
linux-2.6-xen.patch
Log Message:
- linux-2.6-xen update
* linux-2.6.17-xen cset 29030:888231795371
* linux-2.6-xen cset 22813:80c2ccf5c330
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2175
retrieving revision 1.2176
diff -u -r1.2175 -r1.2176
--- kernel-2.6.spec 15 Aug 2006 11:05:16 -0000 1.2175
+++ kernel-2.6.spec 15 Aug 2006 11:07:39 -0000 1.2176
@@ -1538,6 +1538,9 @@
%changelog
* Tue Aug 15 2006 Juan Quintela <quintela@xxxxxxxxxx>
+- linux-2.6-xen update
+ * linux-2.6.17-xen cset 29030:888231795371
+ * linux-2.6-xen cset 22813:80c2ccf5c330
- s/xen_version/xen_hv_cset/ as Fedora.
- update xen hv to cset 11061.
linux-2.6-xen-compile-fixes.patch:
arch/i386/kernel/acpi/boot-xen.c | 3 +-
drivers/block/aoe/aoenet.c | 3 --
linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1
linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 +
linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ----
linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 -
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++-
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 -
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 +
linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h | 6 ++++
14 files changed, 45 insertions(+), 12 deletions(-)
Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-xen-compile-fixes.patch 10 Jul 2006 12:25:28 -0000 1.6
+++ linux-2.6-xen-compile-fixes.patch 15 Aug 2006 11:07:39 -0000 1.7
@@ -26,6 +26,26 @@
return 0;
while (scan_more && instr < max_instr) {
+--- linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h.orig
2006-08-15 12:49:54.000000000 +0200
++++ linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h 2006-08-15
12:54:33.000000000 +0200
+@@ -7,11 +7,17 @@
+ * we put the segment information here.
+ *
+ * cpu_vm_mask is used to optimize ldt flushing.
++ +
++ * exec_limit is used to track the range PROT_EXEC
++ * mappings span.
+ */
+ typedef struct {
+ int size;
+ struct semaphore sem;
+ void *ldt;
++ struct desc_struct user_cs;
++ unsigned long exec_limit;
++ void *vdso;
+ #ifdef CONFIG_XEN
+ int has_foreign_mappings;
+ #endif
diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff
linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h
--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h 2006-02-22
15:56:20.000000000 +0100
+++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h 2006-02-22
18:46:35.000000000 +0100
@@ -50,28 +70,6 @@
#endif /* !__ASSEMBLY__ */
#endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff
linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h
---- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h 2006-02-22
15:56:20.000000000 +0100
-+++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h 2006-02-22
18:17:34.000000000 +0100
-@@ -7,11 +7,18 @@
- * we put the segment information here.
- *
- * cpu_vm_mask is used to optimize ldt flushing.
-+ +
-+ * exec_limit is used to track the range PROT_EXEC
-+ * mappings span.
- */
- typedef struct {
- int size;
- struct semaphore sem;
- void *ldt;
-+ struct desc_struct user_cs;
-+ unsigned long exec_limit;
-+ void *vdso;
-+
- } mm_context_t;
-
- /* mm/memory.c:exit_mmap hook */
diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff
linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h
--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h 2006-02-22
15:56:20.000000000 +0100
+++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h 2006-02-22
18:17:59.000000000 +0100
@@ -197,36 +195,6 @@
return 0;
}
-diff linux-2.6.16.nowork/include/asm-x86_64/ipi.h
linux-2.6.16.noarch/include/asm-x86_64/ipi.h
---- linux-2.6.16.nowork/include/asm-x86_64/ipi.h 2006-03-20
06:53:29.000000000 +0100
-+++ linux-2.6.16.noarch/include/asm-x86_64/ipi.h 2006-04-14
21:46:59.000000000 +0200
-@@ -49,6 +49,7 @@ static inline int __prepare_ICR2 (unsign
- return SET_APIC_DEST_FIELD(mask);
- }
-
-+#ifndef CONFIG_XEN_UNPRIVILEGED_GUEST
- static inline void __send_IPI_shortcut(unsigned int shortcut, int vector,
unsigned int dest)
- {
- /*
-@@ -113,5 +114,6 @@ static inline void send_IPI_mask_sequenc
- }
- local_irq_restore(flags);
- }
-+#endif
-
- #endif /* __ASM_IPI_H */
---- linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h.orig
2006-07-08 12:35:36.000000000 +0200
-+++ linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h 2006-07-08
12:36:25.000000000 +0200
-@@ -47,7 +47,8 @@
- extern unsigned long e820_end_of_ram(void);
- extern void e820_reserve_resources(struct e820entry *e820, int nr_map);
- extern void e820_print_map(char *who);
--extern int e820_mapped(unsigned long start, unsigned long end, unsigned type);
-+extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned
type);
-+extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned
type);
-
- extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned
long end);
- extern void e820_setup_gap(struct e820entry *e820, int nr_map);
--- linux-2.6.17.work/drivers/block/aoe/aoenet.c 2006-06-18
03:49:35.000000000 +0200
+++ linux-2.6.17.noarch/drivers/block/aoe/aoenet.c 2006-07-10
14:23:12.000000000 +0200
@@ -116,8 +116,7 @@
linux-2.6-xen.patch:
Documentation/networking/netdevices.txt | 8
arch/i386/Kconfig | 92
arch/i386/Kconfig.cpu | 2
arch/i386/Kconfig.debug | 1
arch/i386/Makefile | 24
arch/i386/boot-xen/Makefile | 21
arch/i386/kernel/Makefile | 22
arch/i386/kernel/acpi/Makefile | 4
arch/i386/kernel/acpi/boot-xen.c | 1167 ++++++++
arch/i386/kernel/apic-xen.c | 160 +
arch/i386/kernel/asm-offsets.c | 10
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 732 +++++
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 | 903 ++++++
arch/i386/kernel/entry.S | 10
arch/i386/kernel/fixup.c | 86
arch/i386/kernel/head-xen.S | 181 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2751 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
arch/i386/kernel/irq-xen.c | 306 ++
arch/i386/kernel/irq.c | 4
arch/i386/kernel/ldt-xen.c | 270 +
arch/i386/kernel/microcode-xen.c | 148 +
arch/i386/kernel/mpparse-xen.c | 1186 ++++++++
arch/i386/kernel/pci-dma-xen.c | 344 ++
arch/i386/kernel/process-xen.c | 812 +++++
arch/i386/kernel/quirks-xen.c | 48
arch/i386/kernel/setup-xen.c | 1827 +++++++++++++
arch/i386/kernel/smp-xen.c | 614 ++++
arch/i386/kernel/swiotlb.c | 672 ++++
arch/i386/kernel/sysenter.c | 102
arch/i386/kernel/time-xen.c | 1116 ++++++++
arch/i386/kernel/traps-xen.c | 1136 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/vm86.c | 12
arch/i386/kernel/vsyscall-note-xen.S | 32
arch/i386/mach-xen/Makefile | 5
arch/i386/mach-xen/setup.c | 49
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 734 +++++
arch/i386/mm/highmem-xen.c | 133
arch/i386/mm/hypervisor.c | 458 +++
arch/i386/mm/init-xen.c | 850 ++++++
arch/i386/mm/ioremap-xen.c | 478 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 700 +++++
arch/i386/mm/pgtable.c | 12
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 542 +++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1204 ++++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 66
arch/ia64/Makefile | 18
arch/ia64/hp/sim/Makefile | 2
arch/ia64/kernel/asm-offsets.c | 25
arch/ia64/kernel/entry.S | 32
arch/ia64/kernel/gate.S | 112
arch/ia64/kernel/gate.lds.S | 23
arch/ia64/kernel/head.S | 6
arch/ia64/kernel/iosapic.c | 65
arch/ia64/kernel/irq_ia64.c | 255 +
arch/ia64/kernel/pal.S | 5
arch/ia64/kernel/patch.c | 79
arch/ia64/kernel/setup.c | 77
arch/ia64/mm/ioremap.c | 3
arch/ia64/xen/Makefile | 8
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/hypercall.S | 414 +++
arch/ia64/xen/hypervisor.c | 810 +++++
arch/ia64/xen/util.c | 116
arch/ia64/xen/xenentry.S | 883 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2171 +++++++++++++++
arch/ia64/xen/xenminstate.h | 369 ++
arch/ia64/xen/xenpal.S | 76
arch/ia64/xen/xensetup.S | 55
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 | 726 +++++
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 | 198 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/e820-xen.c | 753 +++++
arch/x86_64/kernel/early_printk-xen.c | 304 ++
arch/x86_64/kernel/entry-xen.S | 1141 ++++++++
arch/x86_64/kernel/entry.S | 2
arch/x86_64/kernel/genapic-xen.c | 144 +
arch/x86_64/kernel/genapic_xen.c | 162 +
arch/x86_64/kernel/head-xen.S | 176 +
arch/x86_64/kernel/head64-xen.c | 159 +
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2232 ++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 99
arch/x86_64/kernel/irq-xen.c | 163 +
arch/x86_64/kernel/irq.c | 4
arch/x86_64/kernel/ldt-xen.c | 282 ++
arch/x86_64/kernel/mpparse-xen.c | 1012 +++++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 54
arch/x86_64/kernel/process-xen.c | 791 +++++
arch/x86_64/kernel/setup-xen.c | 1710 ++++++++++++
arch/x86_64/kernel/setup64-xen.c | 360 ++
arch/x86_64/kernel/smp-xen.c | 596 ++++
arch/x86_64/kernel/smp.c | 4
arch/x86_64/kernel/traps-xen.c | 1035 +++++++
arch/x86_64/kernel/vsyscall-xen.c | 239 +
arch/x86_64/kernel/x8664_ksyms-xen.c | 155 +
arch/x86_64/kernel/xen_entry.S | 40
arch/x86_64/mm/Makefile | 10
arch/x86_64/mm/fault-xen.c | 690 +++++
arch/x86_64/mm/init-xen.c | 1202 ++++++++
arch/x86_64/mm/pageattr-xen.c | 397 ++
arch/x86_64/oprofile/Makefile | 5
arch/x86_64/pci/Makefile | 12
drivers/Makefile | 1
drivers/acpi/Kconfig | 3
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 | 758 +++++
drivers/char/tty_io.c | 7
drivers/firmware/Kconfig | 2
drivers/ide/ide-lib.c | 8
drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6
drivers/media/dvb/dvb-core/dvb_net.c | 4
drivers/net/8139cp.c | 2
drivers/net/bnx2.c | 8
drivers/net/bonding/bond_main.c | 9
drivers/net/chelsio/sge.c | 4
drivers/net/e1000/e1000_main.c | 11
drivers/net/forcedeth.c | 26
drivers/net/hamradio/6pack.c | 8
drivers/net/hamradio/mkiss.c | 8
drivers/net/ifb.c | 10
drivers/net/irda/vlsi_ir.c | 2
drivers/net/ixgb/ixgb_main.c | 4
drivers/net/loopback.c | 4
drivers/net/mv643xx_eth.c | 2
drivers/net/natsemi.c | 4
drivers/net/r8169.c | 2
drivers/net/s2io.c | 16
drivers/net/sky2.c | 4
drivers/net/tg3.c | 4
drivers/net/tulip/winbond-840.c | 9
drivers/net/typhoon.c | 6
drivers/net/via-velocity.c | 10
drivers/net/wireless/orinoco.c | 4
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 | 201 +
drivers/pci/Kconfig | 1
drivers/s390/net/qeth_eddp.c | 12
drivers/s390/net/qeth_main.c | 8
drivers/s390/net/qeth_tso.h | 2
drivers/serial/Kconfig | 1
drivers/video/Kconfig | 2
drivers/xen/Kconfig | 260 +
drivers/xen/Makefile | 17
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 617 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 566 ++++
drivers/xen/blkback/common.h | 134
drivers/xen/blkback/interface.c | 171 +
drivers/xen/blkback/vbd.c | 119
drivers/xen/blkback/xenbus.c | 460 +++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 841 ++++++
drivers/xen/blkfront/block.h | 156 +
drivers/xen/blkfront/vbd.c | 318 ++
drivers/xen/blktap/Makefile | 3
drivers/xen/blktap/blktap.c | 1450 ++++++++++
drivers/xen/blktap/common.h | 120
drivers/xen/blktap/interface.c | 159 +
drivers/xen/blktap/xenbus.c | 354 ++
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 182 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 644 ++++
drivers/xen/console/xencons_ring.c | 141 +
drivers/xen/core/Makefile | 13
drivers/xen/core/cpu_hotplug.c | 188 +
drivers/xen/core/evtchn.c | 853 ++++++
drivers/xen/core/features.c | 30
drivers/xen/core/gnttab.c | 442 +++
drivers/xen/core/hypervisor_sysfs.c | 60
drivers/xen/core/reboot.c | 383 ++
drivers/xen/core/skbuff.c | 141 +
drivers/xen/core/smpboot.c | 433 +++
drivers/xen/core/xen_proc.c | 19
drivers/xen/core/xen_sysfs.c | 379 ++
drivers/xen/evtchn/Makefile | 2
drivers/xen/evtchn/evtchn.c | 458 +++
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 138 +
drivers/xen/netback/interface.c | 339 ++
drivers/xen/netback/loopback.c | 261 +
drivers/xen/netback/netback.c | 1345 +++++++++
drivers/xen/netback/xenbus.c | 428 +++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 1841 +++++++++++++
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 | 457 +++
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 | 294 ++
drivers/xen/privcmd/Makefile | 2
drivers/xen/privcmd/privcmd.c | 286 ++
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 85
drivers/xen/tpmback/interface.c | 177 +
drivers/xen/tpmback/tpmback.c | 944 ++++++
drivers/xen/tpmback/xenbus.c | 291 ++
drivers/xen/util.c | 70
drivers/xen/xenbus/Makefile | 12
drivers/xen/xenbus/xenbus_backend_client.c | 135
drivers/xen/xenbus/xenbus_client.c | 281 ++
drivers/xen/xenbus/xenbus_comms.c | 208 +
drivers/xen/xenbus/xenbus_comms.h | 43
drivers/xen/xenbus/xenbus_dev.c | 359 ++
drivers/xen/xenbus/xenbus_probe.c | 1142 ++++++++
drivers/xen/xenbus/xenbus_xs.c | 846 ++++++
fs/Kconfig | 1
include/asm-i386/a.out.h | 2
include/asm-i386/apic.h | 2
include/asm-i386/elf.h | 7
include/asm-i386/fixmap.h | 13
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 | 152 +
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 | 81
include/asm-i386/mach-xen/asm/hw_irq.h | 77
include/asm-i386/mach-xen/asm/hypercall.h | 372 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 220 +
include/asm-i386/mach-xen/asm/io.h | 390 ++
include/asm-i386/mach-xen/asm/kmap_types.h | 32
include/asm-i386/mach-xen/asm/mmu.h | 28
include/asm-i386/mach-xen/asm/mmu_context.h | 109
include/asm-i386/mach-xen/asm/page.h | 336 ++
include/asm-i386/mach-xen/asm/param.h | 24
include/asm-i386/mach-xen/asm/pci.h | 154 +
include/asm-i386/mach-xen/asm/pgalloc.h | 64
include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
include/asm-i386/mach-xen/asm/pgtable-2level.h | 88
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
include/asm-i386/mach-xen/asm/pgtable-3level.h | 197 +
include/asm-i386/mach-xen/asm/pgtable.h | 509 +++
include/asm-i386/mach-xen/asm/processor.h | 753 +++++
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 | 64
include/asm-i386/mach-xen/asm/smp.h | 104
include/asm-i386/mach-xen/asm/spinlock.h | 200 +
include/asm-i386/mach-xen/asm/swiotlb.h | 43
include/asm-i386/mach-xen/asm/synch_bitops.h | 143 +
include/asm-i386/mach-xen/asm/system.h | 578 ++++
include/asm-i386/mach-xen/asm/tlbflush.h | 102
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_post.h | 101
include/asm-i386/mach-xen/setup_arch_pre.h | 5
include/asm-i386/page.h | 4
include/asm-i386/pgtable-2level-defs.h | 2
include/asm-i386/pgtable-3level-defs.h | 2
include/asm-i386/spinlock.h | 2
include/asm-ia64/agp.h | 39
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 | 11
include/asm-ia64/hypercall.h | 496 +++
include/asm-ia64/hypervisor.h | 191 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/io.h | 50
include/asm-ia64/iosapic.h | 2
include/asm-ia64/irq.h | 31
include/asm-ia64/machvec.h | 15
include/asm-ia64/meminit.h | 5
include/asm-ia64/page.h | 114
include/asm-ia64/pal.h | 1
include/asm-ia64/pgalloc.h | 2
include/asm-ia64/privop.h | 59
include/asm-ia64/processor.h | 1
include/asm-ia64/synch_bitops.h | 63
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/hw_irq.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 | 191 +
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 | 114
include/asm-x86_64/mach-xen/asm/floppy.h | 206 +
include/asm-x86_64/mach-xen/asm/hw_irq.h | 145 +
include/asm-x86_64/mach-xen/asm/hypercall.h | 372 ++
include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
include/asm-x86_64/mach-xen/asm/io.h | 328 ++
include/asm-x86_64/mach-xen/asm/irq.h | 39
include/asm-x86_64/mach-xen/asm/mmu.h | 38
include/asm-x86_64/mach-xen/asm/mmu_context.h | 136
include/asm-x86_64/mach-xen/asm/msr.h | 399 ++
include/asm-x86_64/mach-xen/asm/nmi.h | 75
include/asm-x86_64/mach-xen/asm/page.h | 327 ++
include/asm-x86_64/mach-xen/asm/param.h | 23
include/asm-x86_64/mach-xen/asm/pci.h | 174 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 226 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 564 ++++
include/asm-x86_64/mach-xen/asm/processor.h | 494 +++
include/asm-x86_64/mach-xen/asm/ptrace.h | 125
include/asm-x86_64/mach-xen/asm/smp.h | 153 +
include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
include/asm-x86_64/mach-xen/asm/system.h | 428 +++
include/asm-x86_64/mach-xen/asm/timer.h | 67
include/asm-x86_64/mach-xen/asm/tlbflush.h | 104
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/ethtool.h | 2
include/linux/gfp.h | 6
include/linux/highmem.h | 6
include/linux/interrupt.h | 6
include/linux/mm.h | 10
include/linux/netdevice.h | 74
include/linux/oprofile.h | 11
include/linux/pfn.h | 2
include/linux/skbuff.h | 58
include/net/pkt_sched.h | 7
include/net/protocol.h | 3
include/net/sock.h | 4
include/net/tcp.h | 7
include/xen/balloon.h | 63
include/xen/cpu_hotplug.h | 44
include/xen/driver_util.h | 16
include/xen/evtchn.h | 114
include/xen/features.h | 20
include/xen/foreign_page.h | 30
include/xen/gnttab.h | 151 +
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/acm.h | 188 +
include/xen/interface/acm_ops.h | 103
include/xen/interface/arch-ia64.h | 442 +++
include/xen/interface/arch-powerpc.h | 120
include/xen/interface/arch-x86_32.h | 234 +
include/xen/interface/arch-x86_64.h | 300 ++
include/xen/interface/callback.h | 74
include/xen/interface/dom0_ops.h | 605 ++++
include/xen/interface/event_channel.h | 233 +
include/xen/interface/features.h | 53
include/xen/interface/grant_table.h | 362 ++
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/sched.h | 103
include/xen/interface/sched_ctl.h | 69
include/xen/interface/trace.h | 87
include/xen/interface/vcpu.h | 121
include/xen/interface/version.h | 73
include/xen/interface/xen-compat.h | 47
include/xen/interface/xen.h | 512 +++
include/xen/interface/xencomm.h | 37
include/xen/interface/xenoprof.h | 103
include/xen/pcifront.h | 77
include/xen/public/evtchn.h | 91
include/xen/public/privcmd.h | 79
include/xen/xen_proc.h | 13
include/xen/xenbus.h | 299 ++
include/xen/xencons.h | 14
kernel/Kconfig.preempt | 1
kernel/fork.c | 3
kernel/irq/manage.c | 26
kernel/irq/spurious.c | 3
kernel/timer.c | 16
lib/Makefile | 3
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 119
mm/mmap.c | 4
mm/page_alloc.c | 6
net/atm/clip.c | 8
net/bridge/br_device.c | 8
net/bridge/br_forward.c | 2
net/bridge/br_if.c | 23
net/bridge/br_netfilter.c | 7
net/core/dev.c | 284 +-
net/core/dev_mcast.c | 28
net/core/ethtool.c | 37
net/core/netpoll.c | 9
net/core/pktgen.c | 8
net/core/skbuff.c | 181 +
net/decnet/dn_nsp_in.c | 3
net/decnet/dn_route.c | 3
net/ipv4/af_inet.c | 87
net/ipv4/ip_output.c | 18
net/ipv4/ipcomp.c | 11
net/ipv4/netfilter/ip_nat_proto_tcp.c | 7
net/ipv4/netfilter/ip_nat_proto_udp.c | 10
net/ipv4/tcp.c | 86
net/ipv4/tcp_input.c | 2
net/ipv4/tcp_ipv4.c | 18
net/ipv4/tcp_output.c | 47
net/ipv4/xfrm4_output.c | 60
net/ipv6/addrconf.c | 2
net/ipv6/ip6_output.c | 7
net/ipv6/ipcomp6.c | 11
net/ipv6/xfrm6_output.c | 39
net/sched/sch_generic.c | 66
net/sched/sch_teql.c | 9
scripts/Makefile.xen | 14
472 files changed, 87455 insertions(+), 622 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.18 -r 1.19 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-xen.patch 29 Jul 2006 18:20:08 -0000 1.18
+++ linux-2.6-xen.patch 15 Aug 2006 11:07:40 -0000 1.19
@@ -1,6 +1,6 @@
-diff --exclude=.hg -urNp linux-2.6/arch/i386/boot-xen/Makefile
new/arch/i386/boot-xen/Makefile
---- linux-2.6/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000
+0100
-+++ new/arch/i386/boot-xen/Makefile 2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/boot-xen/Makefile
compiling/arch/i386/boot-xen/Makefile
+--- linux-2.6.17.8/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000
+0100
++++ compiling/arch/i386/boot-xen/Makefile 2006-08-13 14:43:06.000000000
+0200
@@ -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 --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig 2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/Kconfig 2006-05-23 18:37:09.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/Kconfig
compiling/arch/i386/Kconfig
+--- linux-2.6.17.8/arch/i386/Kconfig 2006-08-14 17:09:58.000000000 +0200
++++ compiling/arch/i386/Kconfig 2006-08-14 17:20:23.000000000 +0200
@@ -91,6 +91,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -188,8 +188,8 @@
help
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
-@@ -767,18 +791,20 @@ endmenu
-
+@@ -770,18 +794,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+ depends on HIGHMEM
menu "Power management options (ACPI, APM)"
- depends on !X86_VOYAGER
@@ -212,7 +212,7 @@
---help---
APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with
-@@ -963,6 +989,7 @@ choice
+@@ -966,6 +992,7 @@ choice
config PCI_GOBIOS
bool "BIOS"
@@ -220,7 +220,7 @@
config PCI_GOMMCONFIG
bool "MMConfig"
-@@ -970,6 +997,13 @@ config PCI_GOMMCONFIG
+@@ -973,6 +1000,13 @@ config PCI_GOMMCONFIG
config PCI_GODIRECT
bool "Direct"
@@ -234,7 +234,7 @@
config PCI_GOANY
bool "Any"
-@@ -977,7 +1011,7 @@ endchoice
+@@ -980,7 +1014,7 @@ endchoice
config PCI_BIOS
bool
@@ -243,7 +243,7 @@
default y
config PCI_DIRECT
-@@ -990,6 +1024,18 @@ config PCI_MMCONFIG
+@@ -993,6 +1027,18 @@ config PCI_MMCONFIG
depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
default y
@@ -262,7 +262,7 @@
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
-@@ -1000,7 +1046,7 @@ config ISA_DMA_API
+@@ -1003,7 +1049,7 @@ config ISA_DMA_API
config ISA
bool "ISA support"
@@ -271,7 +271,7 @@
help
Find out whether you have ISA slots on your motherboard. ISA is the
name of a bus system, i.e. the way the CPU talks to the other stuff
-@@ -1027,7 +1073,7 @@ config EISA
+@@ -1030,7 +1076,7 @@ config EISA
source "drivers/eisa/Kconfig"
config MCA
@@ -280,7 +280,7 @@
default y if X86_VOYAGER
help
MicroChannel Architecture is found in some IBM PS/2 machines and
-@@ -1089,6 +1135,8 @@ source "security/Kconfig"
+@@ -1092,6 +1138,8 @@ source "security/Kconfig"
source "crypto/Kconfig"
@@ -289,7 +289,7 @@
source "lib/Kconfig"
#
-@@ -1114,7 +1162,7 @@ config X86_SMP
+@@ -1117,7 +1165,7 @@ config X86_SMP
config X86_HT
bool
@@ -298,7 +298,7 @@
default y
config X86_BIOS_REBOOT
-@@ -1127,6 +1175,16 @@ config X86_TRAMPOLINE
+@@ -1130,6 +1178,16 @@ config X86_TRAMPOLINE
depends on X86_SMP || (X86_VOYAGER && SMP)
default y
@@ -315,9 +315,9 @@
config KTIME_SCALAR
bool
default y
-diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig.cpu
new/arch/i386/Kconfig.cpu
---- linux-2.6/arch/i386/Kconfig.cpu 2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/Kconfig.cpu 2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/Kconfig.cpu
compiling/arch/i386/Kconfig.cpu
+--- linux-2.6.17.8/arch/i386/Kconfig.cpu 2006-06-18 03:49:35.000000000
+0200
++++ compiling/arch/i386/Kconfig.cpu 2006-08-13 14:43:06.000000000 +0200
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -327,9 +327,9 @@
default y
config X86_WP_WORKS_OK
-diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig.debug
new/arch/i386/Kconfig.debug
---- linux-2.6/arch/i386/Kconfig.debug 2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/Kconfig.debug 2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/Kconfig.debug
compiling/arch/i386/Kconfig.debug
+--- linux-2.6.17.8/arch/i386/Kconfig.debug 2006-06-18 03:49:35.000000000
+0200
++++ compiling/arch/i386/Kconfig.debug 2006-08-13 14:43:06.000000000 +0200
@@ -84,6 +84,7 @@ config X86_MPPARSE
config DOUBLEFAULT
default y
@@ -338,9 +338,9 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/acpi/boot-xen.c
new/arch/i386/kernel/acpi/boot-xen.c
---- linux-2.6/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000
+0100
-+++ new/arch/i386/kernel/acpi/boot-xen.c 2006-05-23 18:37:09.000000000
+0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/acpi/boot-xen.c
compiling/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6.17.8/arch/i386/kernel/acpi/boot-xen.c 1970-01-01
01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/acpi/boot-xen.c 2006-08-13 14:43:06.000000000
+0200
@@ -0,0 +1,1167 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1509,9 +1509,9 @@
+
+ return 0;
+}
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/acpi/Makefile
new/arch/i386/kernel/acpi/Makefile
---- linux-2.6/arch/i386/kernel/acpi/Makefile 2006-07-03 14:14:14.000000000
+0200
-+++ new/arch/i386/kernel/acpi/Makefile 2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/acpi/Makefile
compiling/arch/i386/kernel/acpi/Makefile
+--- linux-2.6.17.8/arch/i386/kernel/acpi/Makefile 2006-06-18
03:49:35.000000000 +0200
++++ compiling/arch/i386/kernel/acpi/Makefile 2006-08-13 14:43:06.000000000
+0200
@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -1520,9 +1520,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/apic-xen.c
new/arch/i386/kernel/apic-xen.c
---- linux-2.6/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000
+0100
-+++ new/arch/i386/kernel/apic-xen.c 2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/apic-xen.c
compiling/arch/i386/kernel/apic-xen.c
+--- linux-2.6.17.8/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000
+0100
++++ compiling/arch/i386/kernel/apic-xen.c 2006-08-13 14:43:06.000000000
+0200
@@ -0,0 +1,160 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1684,9 +1684,9 @@
+
+ return 0;
+}
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/asm-offsets.c
new/arch/i386/kernel/asm-offsets.c
---- linux-2.6/arch/i386/kernel/asm-offsets.c 2006-07-03 14:14:14.000000000
+0200
-+++ new/arch/i386/kernel/asm-offsets.c 2006-05-09 12:32:34.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/asm-offsets.c
compiling/arch/i386/kernel/asm-offsets.c
+--- linux-2.6.17.8/arch/i386/kernel/asm-offsets.c 2006-06-18
03:49:35.000000000 +0200
++++ compiling/arch/i386/kernel/asm-offsets.c 2006-08-13 14:43:06.000000000
+0200
@@ -13,6 +13,7 @@
#include <asm/fixmap.h>
[...16155 lines suppressed...]
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp.c
compiling/net/ipv4/tcp.c
+--- linux-2.6.17.8/net/ipv4/tcp.c 2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv4/tcp.c 2006-08-13 14:43:29.000000000 +0200
@@ -258,6 +258,7 @@
#include <linux/random.h>
#include <linux/bootmem.h>
@@ -89267,9 +92984,9 @@
extern void __skb_cb_too_small_for_tcp(int, int);
extern struct tcp_congestion_ops tcp_reno;
-diff --exclude=.hg -urNp linux-2.6/net/ipv4/tcp_input.c
new/net/ipv4/tcp_input.c
---- linux-2.6/net/ipv4/tcp_input.c 2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv4/tcp_input.c 2006-07-07 16:21:07.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp_input.c
compiling/net/ipv4/tcp_input.c
+--- linux-2.6.17.8/net/ipv4/tcp_input.c 2006-06-18 03:49:35.000000000
+0200
++++ compiling/net/ipv4/tcp_input.c 2006-08-13 14:43:29.000000000 +0200
@@ -1072,7 +1072,7 @@ tcp_sacktag_write_queue(struct sock *sk,
else
pkt_len = (end_seq -
@@ -89279,9 +92996,37 @@
break;
pcount = tcp_skb_pcount(skb);
}
-diff --exclude=.hg -urNp linux-2.6/net/ipv4/tcp_output.c
new/net/ipv4/tcp_output.c
---- linux-2.6/net/ipv4/tcp_output.c 2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv4/tcp_output.c 2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp_ipv4.c
compiling/net/ipv4/tcp_ipv4.c
+--- linux-2.6.17.8/net/ipv4/tcp_ipv4.c 2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv4/tcp_ipv4.c 2006-08-15 11:12:41.000000000 +0200
+@@ -495,6 +495,24 @@ void tcp_v4_send_check(struct sock *sk,
+ }
+ }
+
++int tcp_v4_gso_send_check(struct sk_buff *skb)
++{
++ struct iphdr *iph;
++ struct tcphdr *th;
++
++ if (!pskb_may_pull(skb, sizeof(*th)))
++ return -EINVAL;
++
++ iph = skb->nh.iph;
++ th = skb->h.th;
++
++ th->check = 0;
++ th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
++ skb->csum = offsetof(struct tcphdr, check);
++ skb->ip_summed = CHECKSUM_HW;
++ return 0;
++}
++
+ /*
+ * This routine will send an RST to the other tcp.
+ *
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp_output.c
compiling/net/ipv4/tcp_output.c
+--- linux-2.6.17.8/net/ipv4/tcp_output.c 2006-06-18 03:49:35.000000000
+0200
++++ compiling/net/ipv4/tcp_output.c 2006-08-13 14:43:29.000000000 +0200
@@ -511,15 +511,17 @@ static void tcp_set_skb_tso_segs(struct
/* Avoid the costly divide in the normal
* non-TSO case.
@@ -89397,9 +93142,9 @@
/* Use a previous sequence. This should cause the other
* end to send an ack. Don't queue or clone SKB, just
-diff --exclude=.hg -urNp linux-2.6/net/ipv4/xfrm4_output.c
new/net/ipv4/xfrm4_output.c
---- linux-2.6/net/ipv4/xfrm4_output.c 2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv4/xfrm4_output.c 2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/xfrm4_output.c
compiling/net/ipv4/xfrm4_output.c
+--- linux-2.6.17.8/net/ipv4/xfrm4_output.c 2006-06-18 03:49:35.000000000
+0200
++++ compiling/net/ipv4/xfrm4_output.c 2006-08-15 11:12:41.000000000 +0200
@@ -9,6 +9,8 @@
*/
@@ -89471,7 +93216,7 @@
+ }
+#endif
+
-+ if (!skb_shinfo(skb)->gso_size)
++ if (!skb_is_gso(skb))
+ return xfrm4_output_finish2(skb);
+
+ skb->protocol = htons(ETH_P_IP);
@@ -89505,10 +93250,10 @@
int xfrm4_output(struct sk_buff *skb)
{
return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL,
skb->dst->dev,
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/addrconf.c new/net/ipv6/addrconf.c
---- linux-2.6/net/ipv6/addrconf.c 2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/addrconf.c 2006-06-28 14:32:14.000000000 +0200
-@@ -2461,6 +2461,7 @@ static void addrconf_dad_start(struct in
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/addrconf.c
compiling/net/ipv6/addrconf.c
+--- linux-2.6.17.8/net/ipv6/addrconf.c 2006-08-14 17:09:58.000000000 +0200
++++ compiling/net/ipv6/addrconf.c 2006-08-14 17:20:23.000000000 +0200
+@@ -2470,6 +2470,7 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
@@ -89516,7 +93261,7 @@
!(ifp->flags&IFA_F_TENTATIVE)) {
ifp->flags &= ~IFA_F_TENTATIVE;
spin_unlock_bh(&ifp->lock);
-@@ -2545,6 +2546,7 @@ static void addrconf_dad_completed(struc
+@@ -2554,6 +2555,7 @@ static void addrconf_dad_completed(struc
if (ifp->idev->cnf.forwarding == 0 &&
ifp->idev->cnf.rtr_solicits > 0 &&
(dev->flags&IFF_LOOPBACK) == 0 &&
@@ -89524,15 +93269,15 @@
(ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
struct in6_addr all_routers;
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/ip6_output.c
new/net/ipv6/ip6_output.c
---- linux-2.6/net/ipv6/ip6_output.c 2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/ip6_output.c 2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/ip6_output.c
compiling/net/ipv6/ip6_output.c
+--- linux-2.6.17.8/net/ipv6/ip6_output.c 2006-06-18 03:49:35.000000000
+0200
++++ compiling/net/ipv6/ip6_output.c 2006-08-15 11:12:41.000000000 +0200
@@ -147,7 +147,7 @@ static int ip6_output2(struct sk_buff *s
int ip6_output(struct sk_buff *skb)
{
- if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->ufo_size) ||
-+ if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size) ||
++ if ((skb->len > dst_mtu(skb->dst) && !skb_is_gso(skb)) ||
dst_allfrag(skb->dst))
return ip6_fragment(skb, ip6_output2);
else
@@ -89548,9 +93293,9 @@
ipv6_select_ident(skb, &fhdr);
skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
__skb_queue_tail(&sk->sk_write_queue, skb);
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/ipcomp6.c new/net/ipv6/ipcomp6.c
---- linux-2.6/net/ipv6/ipcomp6.c 2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/ipcomp6.c 2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/ipcomp6.c
compiling/net/ipv6/ipcomp6.c
+--- linux-2.6.17.8/net/ipv6/ipcomp6.c 2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv6/ipcomp6.c 2006-08-13 14:43:29.000000000 +0200
@@ -65,7 +65,7 @@ static LIST_HEAD(ipcomp6_tfms_list);
static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
@@ -89585,9 +93330,9 @@
/* compression */
plen = skb->len - hdr_len;
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/xfrm6_output.c
new/net/ipv6/xfrm6_output.c
---- linux-2.6/net/ipv6/xfrm6_output.c 2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/xfrm6_output.c 2006-07-07 15:10:03.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/xfrm6_output.c
compiling/net/ipv6/xfrm6_output.c
+--- linux-2.6.17.8/net/ipv6/xfrm6_output.c 2006-06-18 03:49:35.000000000
+0200
++++ compiling/net/ipv6/xfrm6_output.c 2006-08-15 11:08:12.000000000 +0200
@@ -151,7 +151,7 @@ error_nolock:
goto out_exit;
}
@@ -89614,7 +93359,7 @@
+{
+ struct sk_buff *segs;
+
-+ if (!skb_shinfo(skb)->gso_size)
++ if (!skb_is_gso(skb))
+ return xfrm6_output_finish2(skb);
+
+ skb->protocol = htons(ETH_P_IP);
@@ -89648,9 +93393,9 @@
int xfrm6_output(struct sk_buff *skb)
{
return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dst->dev,
-diff --exclude=.hg -urNp linux-2.6/net/sched/sch_generic.c
new/net/sched/sch_generic.c
---- linux-2.6/net/sched/sch_generic.c 2006-07-03 14:15:23.000000000 +0200
-+++ new/net/sched/sch_generic.c 2006-07-07 17:21:02.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/sched/sch_generic.c
compiling/net/sched/sch_generic.c
+--- linux-2.6.17.8/net/sched/sch_generic.c 2006-06-18 03:49:35.000000000
+0200
++++ compiling/net/sched/sch_generic.c 2006-08-13 14:43:30.000000000 +0200
@@ -72,9 +72,9 @@ void qdisc_unlock_tree(struct net_device
dev->queue_lock serializes queue accesses for this device
AND dev->qdisc pointer itself.
@@ -89823,9 +93568,9 @@
-EXPORT_SYMBOL(qdisc_restart);
EXPORT_SYMBOL(qdisc_lock_tree);
EXPORT_SYMBOL(qdisc_unlock_tree);
-diff --exclude=.hg -urNp linux-2.6/net/sched/sch_teql.c
new/net/sched/sch_teql.c
---- linux-2.6/net/sched/sch_teql.c 2006-07-03 14:15:23.000000000 +0200
-+++ new/net/sched/sch_teql.c 2006-07-07 15:10:03.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/sched/sch_teql.c
compiling/net/sched/sch_teql.c
+--- linux-2.6.17.8/net/sched/sch_teql.c 2006-06-18 03:49:35.000000000
+0200
++++ compiling/net/sched/sch_teql.c 2006-08-13 14:43:30.000000000 +0200
@@ -302,20 +302,17 @@ restart:
switch (teql_resolve(skb, skb_res, slave)) {
@@ -89850,9 +93595,9 @@
}
if (netif_queue_stopped(dev))
busy = 1;
-diff --exclude=.hg -urNp linux-2.6/scripts/Makefile.xen
new/scripts/Makefile.xen
---- linux-2.6/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
-+++ new/scripts/Makefile.xen 2006-05-09 12:40:15.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/scripts/Makefile.xen
compiling/scripts/Makefile.xen
+--- linux-2.6.17.8/scripts/Makefile.xen 1970-01-01 01:00:00.000000000
+0100
++++ compiling/scripts/Makefile.xen 2006-08-13 14:43:30.000000000 +0200
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|