rpms/kernel/FC-6 .cvsignore, 1.555, 1.556 kernel-2.6.spec, 1.2926, 1.2927 linux-2.6-devmem.patch, 1.14, 1.15 linux-2.6-xen-execshield.patch, 1.2, 1.3 linux-2.6-xen-utrace.patch, 1.1, 1.2 linux-2.6-xen.patch, 1.84, 1.85 sources, 1.519, 1.520 linux-2.6-ia64-kexec-kdump-xen-conflict.patch, 1.2, NONE linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 14 01:42:27 UTC 2007
- Previous message (by thread): rpms/kernel/FC-6/scripts rebase-xen-kernel.sh,1.9,1.10
- Next message (by thread): rpms/kernel/FC-5 .cvsignore, 1.436, 1.437 kernel-2.6.spec, 1.2301, 1.2302 linux-2.6-devmem.patch, 1.11, 1.12 linux-2.6-xen-execshield.patch, 1.2, 1.3 linux-2.6-xen.patch, 1.31, 1.32 sources, 1.376, 1.377 linux-2.6-ia64-kexec-kdump-xen-conflict.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: quintela
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv12375
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6-devmem.patch
linux-2.6-xen-execshield.patch linux-2.6-xen-utrace.patch
linux-2.6-xen.patch sources
Removed Files:
linux-2.6-ia64-kexec-kdump-xen-conflict.patch
linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch
Log Message:
- Enable xen again & update all the xen patches to 2.6.20.2.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- .cvsignore 13 Mar 2007 23:06:11 -0000 1.555
+++ .cvsignore 14 Mar 2007 01:42:23 -0000 1.556
@@ -6,3 +6,4 @@
patch-2.6.20.1.bz2
patch-2.6.20.1-2.bz2
patch-2.6.20.2-3.bz2
+xen-3.0.3-11774.tar.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2926
retrieving revision 1.2927
diff -u -r1.2926 -r1.2927
--- kernel-2.6.spec 13 Mar 2007 23:06:11 -0000 1.2926
+++ kernel-2.6.spec 14 Mar 2007 01:42:23 -0000 1.2927
@@ -8,7 +8,7 @@
%define buildsmp 0
%define buildpae 0
# Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
# Whether to build the Xen kernels, disable if you want.
%define buildxen 1
%define builddoc 0
@@ -267,7 +267,7 @@
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-#Source1: xen-3.0.3-%{xen_hv_cset}.tar.bz2
+Source1: xen-3.0.3-%{xen_hv_cset}.tar.bz2
Source2: Config.mk
Source10: COPYING.modules
@@ -382,8 +382,6 @@
Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
Patch954: linux-2.6-xen-execshield.patch
Patch955: linux-2.6-xen-tux.patch
-Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
-Patch959: linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch
#
# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -1006,10 +1004,6 @@
# Xen exec-shield bits
%patch954 -p1
%patch955 -p1
-# ia64 xen cleanups for kexec/kdump
-%patch958 -p1
-
-%patch959 -p1
%endif
#
@@ -2094,6 +2088,9 @@
%endif
%changelog
+* Wed Mar 14 2007 Juan Quintela <quintela at redhat.com>
+- Enable xen again & update all the xen patches to 2.6.20.2.
+
* Tue Mar 13 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.20.3
- added
linux-2.6-devmem.patch:
linux-2.6.20.noarch/include/asm-ia64/page.h | 1
linux-2.6/arch/i386/mm/init.c | 19 +++
linux-2.6/arch/ia64/mm/init.c | 7 +
linux-2.6/arch/powerpc/mm/mem.c | 14 ++
linux-2.6/arch/s390/mm/init.c | 5
linux-2.6/arch/x86_64/mm/init.c | 42 ++++++++
linux-2.6/drivers/char/mem.c | 144 ++++------------------------
linux-2.6/fs/proc/kcore.c | 2
linux-2.6/include/asm-alpha/page.h | 2
linux-2.6/include/asm-arm/page.h | 2
linux-2.6/include/asm-arm26/page.h | 2
linux-2.6/include/asm-cris/page.h | 2
linux-2.6/include/asm-h8300/page.h | 2
linux-2.6/include/asm-i386/page.h | 2
linux-2.6/include/asm-m68k/page.h | 2
linux-2.6/include/asm-m68knommu/page.h | 2
linux-2.6/include/asm-mips/page.h | 2
linux-2.6/include/asm-parisc/page.h | 2
linux-2.6/include/asm-powerpc/page.h | 2
linux-2.6/include/asm-ppc/page.h | 2
linux-2.6/include/asm-s390/page.h | 2
linux-2.6/include/asm-sh/page.h | 2
linux-2.6/include/asm-sh64/page.h | 2
linux-2.6/include/asm-sparc/page.h | 2
linux-2.6/include/asm-sparc64/page.h | 2
linux-2.6/include/asm-um/page.h | 1
linux-2.6/include/asm-v850/page.h | 2
linux-2.6/include/asm-x86_64/page.h | 4
28 files changed, 152 insertions(+), 123 deletions(-)
Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-devmem.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-devmem.patch 15 Feb 2007 17:29:29 -0000 1.14
+++ linux-2.6-devmem.patch 14 Mar 2007 01:42:23 -0000 1.15
@@ -442,17 +442,17 @@
#endif /* __ASSEMBLY__ */
#ifdef __ASSEMBLY__
-Index: linux-2.6/include/asm-ia64/page.h
-===================================================================
---- linux-2.6.orig/include/asm-ia64/page.h
-+++ linux-2.6/include/asm-ia64/page.h
-@@ -227,5 +227,6 @@ get_order (unsigned long size)
+diff -uNp linux-2.6.20.noarch/include/asm-ia64/page.h.orig linux-2.6.20.noarch/include/asm-ia64/page.h
+--- linux-2.6.20.noarch/include/asm-ia64/page.h.orig 2007-03-08 20:01:32.000000000 +0100
++++ linux-2.6.20.noarch/include/asm-ia64/page.h 2007-03-08 20:02:29.000000000 +0100
+@@ -228,6 +228,7 @@ get_order (unsigned long size)
(((current->personality & READ_IMPLIES_EXEC) != 0) \
? VM_EXEC : 0))
+#define devmem_is_allowed(x) 1
- # endif /* __KERNEL__ */
- #endif /* _ASM_IA64_PAGE_H */
+ #ifndef __ASSEMBLY__
+ #ifdef CONFIG_XEN
+
Index: linux-2.6/include/asm-m68k/page.h
===================================================================
--- linux-2.6.orig/include/asm-m68k/page.h
linux-2.6-xen-execshield.patch:
arch/i386/kernel/cpu/common-xen.c | 7 +
arch/i386/kernel/process-xen.c | 60 ++++++++++
arch/i386/kernel/smp-xen.c | 3
arch/i386/kernel/traps-xen.c | 94 ++++++++++++++++-
arch/x86_64/kernel/process-xen.c | 6 -
arch/x86_64/kernel/setup64-xen.c | 40 -------
arch/x86_64/mm/fault-xen.c | 2
include/asm-i386/mach-xen/asm/pgalloc.h | 1
include/asm-i386/mach-xen/asm/processor.h | 8 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 8 +
linux-2.6.19.noarch/arch/i386/mm/init-xen.c | 6 -
linux-2.6.20.work/include/asm-i386/mach-xen/asm/desc.h | 14 ++
12 files changed, 199 insertions(+), 50 deletions(-)
Index: linux-2.6-xen-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-xen-execshield.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-execshield.patch 24 Dec 2006 00:48:31 -0000 1.2
+++ linux-2.6-xen-execshield.patch 14 Mar 2007 01:42:23 -0000 1.3
@@ -266,20 +266,6 @@
pagetable_init();
-diff -r 095d53b0d1a6 arch/x86_64/ia32/syscall32-xen.c
---- a/arch/x86_64/ia32/syscall32-xen.c Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/x86_64/ia32/syscall32-xen.c Tue Jul 25 23:02:25 2006 +0200
-@@ -47,7 +47,9 @@ struct linux_binprm;
- struct linux_binprm;
-
- /* Setup a VMA at program startup for the vsyscall page */
--int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
-+int syscall32_setup_pages(struct linux_binprm *bprm, int exstack,
-+ unsigned long start_code,
-+ unsigned long interp_map_address)
- {
- int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
- struct vm_area_struct *vma;
diff -r 095d53b0d1a6 arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/x86_64/kernel/process-xen.c Tue Jul 25 23:02:25 2006 +0200
@@ -361,7 +347,10 @@
diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/desc.h
--- a/include/asm-i386/mach-xen/asm/desc.h Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-i386/mach-xen/asm/desc.h Tue Jul 25 23:02:25 2006 +0200
-@@ -159,6 +159,20 @@ static inline unsigned long get_desc_bas
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.20.noarch/include/asm-i386/mach-xen/asm/desc.h linux-2.6.20.work/include/asm-i386/mach-xen/asm/desc.h
+--- linux-2.6.20.noarch/include/asm-i386/mach-xen/asm/desc.h 2007-03-14 00:37:28.000000000 +0100
++++ linux-2.6.20.work/include/asm-i386/mach-xen/asm/desc.h 2007-03-13 12:55:33.000000000 +0100
+@@ -194,6 +194,20 @@ static inline unsigned long get_desc_bas
return base;
}
@@ -379,28 +368,9 @@
+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
+extern void arch_flush_exec_range(struct mm_struct *mm);
+
- #endif /* !__ASSEMBLY__ */
-
- #endif
-diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/mmu.h
---- a/include/asm-i386/mach-xen/asm/mmu.h Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-i386/mach-xen/asm/mmu.h Tue Jul 25 23:02:25 2006 +0200
-@@ -7,11 +7,15 @@
- * 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;
+ #else /* __ASSEMBLY__ */
+ /*
diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/pgalloc.h
--- a/include/asm-i386/mach-xen/asm/pgalloc.h Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-i386/mach-xen/asm/pgalloc.h Tue Jul 25 23:02:25 2006 +0200
linux-2.6-xen-utrace.patch:
i386/kernel/entry-xen.S | 7 ++-----
i386/kernel/process-xen.c | 3 ---
x86_64/ia32/ia32entry-xen.S | 2 +-
x86_64/kernel/process-xen.c | 5 -----
x86_64/kernel/traps-xen.c | 8 --------
x86_64/mm/fault-xen.c | 4 ++--
6 files changed, 5 insertions(+), 24 deletions(-)
Index: linux-2.6-xen-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-xen-utrace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-utrace.patch 19 Jul 2006 17:25:03 -0000 1.1
+++ linux-2.6-xen-utrace.patch 14 Mar 2007 01:42:23 -0000 1.2
@@ -26,7 +26,7 @@
- cmpl $0, %eax
- jne resume_userspace # ret != 0 -> running under PTRACE_SYSEMU,
- # so must skip actual syscall
- movl ORIG_EAX(%esp), %eax
+ movl PT_ORIG_EAX(%esp), %eax
cmpl $(nr_syscalls), %eax
jnae syscall_call
diff -urNp linux-2.6.17.previous/arch/i386/kernel/process-xen.c linux-2.6.17.noarch/arch/i386/kernel/process-xen.c
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.c | 10
arch/i386/kernel/alternative.c | 11
arch/i386/kernel/apic-xen.c | 223 +
arch/i386/kernel/asm-offsets.c | 13
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 868 +++++++
arch/i386/kernel/cpu/mtrr/Makefile | 7
arch/i386/kernel/cpu/mtrr/main-xen.c | 197 +
arch/i386/kernel/e820.c | 106
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 | 286 ++
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2973 ++++++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
arch/i386/kernel/irq.c | 4
arch/i386/kernel/ldt-xen.c | 268 ++
arch/i386/kernel/microcode-xen.c | 147 +
arch/i386/kernel/mpparse.c | 28
arch/i386/kernel/pci-dma-xen.c | 374 +++
arch/i386/kernel/process-xen.c | 851 ++++++
arch/i386/kernel/quirks.c | 12
arch/i386/kernel/setup-xen.c | 835 ++++++
arch/i386/kernel/smp-xen.c | 624 +++++
arch/i386/kernel/swiotlb.c | 672 +++++
arch/i386/kernel/sysenter.c | 18
arch/i386/kernel/time-xen.c | 1065 ++++++++
arch/i386/kernel/traps-xen.c | 1132 +++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/tsc.c | 2
arch/i386/kernel/vm86.c | 12
arch/i386/kernel/vmlinux.lds.S | 6
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 | 103
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 | 117
arch/i386/mm/hypervisor.c | 457 +++
arch/i386/mm/init-xen.c | 871 +++++++
arch/i386/mm/ioremap-xen.c | 443 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 724 +++++
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 584 ++++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq.c | 12
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 | 23
arch/x86_64/ia32/ia32entry-xen.S | 743 +++++
arch/x86_64/ia32/syscall32.c | 24
arch/x86_64/ia32/syscall32_syscall.S | 11
arch/x86_64/ia32/vsyscall-int80.S | 58
arch/x86_64/ia32/vsyscall-sigreturn.S | 2
arch/x86_64/kernel/Makefile | 18
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 | 758 ++++++
arch/x86_64/kernel/early_printk.c | 34
arch/x86_64/kernel/entry-xen.S | 1160 +++++++++
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.c | 54
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2221 +++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 99
arch/x86_64/kernel/irq.c | 4
arch/x86_64/kernel/ldt-xen.c | 283 ++
arch/x86_64/kernel/mpparse.c | 22
arch/x86_64/kernel/pci-swiotlb.c | 12
arch/x86_64/kernel/process-xen.c | 865 ++++++
arch/x86_64/kernel/setup-xen.c | 1478 +++++++++++
arch/x86_64/kernel/setup64-xen.c | 356 ++
arch/x86_64/kernel/smp-xen.c | 576 ++++
arch/x86_64/kernel/time-xen.c | 1057 ++++++++
arch/x86_64/kernel/traps-xen.c | 1156 +++++++++
arch/x86_64/kernel/vmlinux.lds.S | 2
arch/x86_64/kernel/vsyscall.c | 19
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 | 1148 +++++++++
arch/x86_64/mm/pageattr.c | 171 +
arch/x86_64/oprofile/Makefile | 5
arch/x86_64/pci/Makefile | 5
drivers/Makefile | 1
drivers/acpi/Kconfig | 5
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 | 847 ++++++
drivers/xen/blkfront/block.h | 154 +
drivers/xen/blkfront/vbd.c | 318 ++
drivers/xen/blktap/Makefile | 6
drivers/xen/blktap/blktapmain.c | 1389 +++++++++++
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 | 714 +++++
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 | 481 +++
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 | 687 +++++
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 | 322 ++
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 | 301 ++
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 | 923 +++++++
drivers/xen/pciback/pciback.h | 93
drivers/xen/pciback/pciback_ops.c | 94
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 | 1208 +++++++++
drivers/xen/xenbus/xenbus_xs.c | 853 ++++++
fs/Kconfig | 1
include/asm-i386/apic.h | 2
include/asm-i386/highmem.h | 3
include/asm-i386/kmap_types.h | 5
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 | 222 +
include/asm-i386/mach-xen/asm/dma-mapping.h | 151 +
include/asm-i386/mach-xen/asm/fixmap.h | 163 +
include/asm-i386/mach-xen/asm/floppy.h | 147 +
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 | 368 ++
include/asm-i386/mach-xen/asm/irqflags.h | 96
include/asm-i386/mach-xen/asm/maddr.h | 160 +
include/asm-i386/mach-xen/asm/mmu_context.h | 107
include/asm-i386/mach-xen/asm/page.h | 224 +
include/asm-i386/mach-xen/asm/pgalloc.h | 63
include/asm-i386/mach-xen/asm/pgtable-2level.h | 77
include/asm-i386/mach-xen/asm/pgtable-3level.h | 194 +
include/asm-i386/mach-xen/asm/pgtable.h | 561 ++++
include/asm-i386/mach-xen/asm/processor.h | 759 ++++++
include/asm-i386/mach-xen/asm/scatterlist.h | 22
include/asm-i386/mach-xen/asm/smp.h | 115
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 | 535 ++++
include/asm-i386/mach-xen/asm/timer.h | 67
include/asm-i386/mach-xen/asm/tlbflush.h | 106
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/mmu.h | 13
include/asm-i386/pci.h | 35
include/asm-i386/pgtable-2level-defs.h | 2
include/asm-i386/pgtable-3level-defs.h | 6
include/asm-i386/segment.h | 8
include/asm-i386/setup.h | 6
include/asm-i386/vga.h | 4
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/libata-portmap.h | 12
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/bootsetup.h | 6
include/asm-x86_64/dma-mapping.h | 5
include/asm-x86_64/dmi.h | 9
include/asm-x86_64/dwarf2.h | 2
include/asm-x86_64/e820.h | 8
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/desc.h | 212 +
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_context.h | 135 +
include/asm-x86_64/mach-xen/asm/msr.h | 427 +++
include/asm-x86_64/mach-xen/asm/page.h | 213 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 224 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 553 ++++
include/asm-x86_64/mach-xen/asm/processor.h | 507 ++++
include/asm-x86_64/mach-xen/asm/smp.h | 119
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/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/asm-x86_64/mmu.h | 18
include/asm-x86_64/nmi.h | 22
include/asm-x86_64/pci.h | 26
include/asm-x86_64/vga.h | 4
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/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 | 8
net/ipv4/xfrm4_output.c | 6
net/ipv6/addrconf.c | 3
scripts/Makefile.xen | 14
419 files changed, 82587 insertions(+), 234 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.84 -r 1.85 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.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- linux-2.6-xen.patch 22 Jan 2007 23:08:27 -0000 1.84
+++ linux-2.6-xen.patch 14 Mar 2007 01:42:23 -0000 1.85
@@ -1,6 +1,7 @@
-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
+ * linux-2.6.20-xen-3.0.3 changeset: 48674:8ab38eac49ad
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/arch/i386/boot-xen/Makefile linux-2.6.20-xen-3.0.3/arch/i386/boot-xen/Makefile
+--- /scratch/src/linux-2.6.20.2/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/arch/i386/boot-xen/Makefile 2007-01-24 01:41:33.000000000 +0100
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +24,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=.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
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/arch/i386/Kconfig linux-2.6.20-xen-3.0.3/arch/i386/Kconfig
+--- /scratch/src/linux-2.6.20.2/arch/i386/Kconfig 2007-02-04 19:44:54.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/arch/i386/Kconfig 2007-03-12 23:43:05.000000000 +0100
@@ -16,6 +16,7 @@ config X86_32
config GENERIC_TIME
@@ -34,7 +35,7 @@
default y
config LOCKDEP_SUPPORT
-@@ -103,6 +104,15 @@ config X86_PC
+@@ -108,6 +109,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -50,7 +51,7 @@
config X86_ELAN
bool "AMD Elan"
help
-@@ -212,6 +222,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -229,6 +239,7 @@ source "arch/i386/Kconfig.cpu"
config HPET_TIMER
bool "HPET Timer Support"
@@ -58,7 +59,7 @@
help
This enables the use of the HPET for the kernel's internal timer.
HPET is the next generation timer replacing legacy 8254s.
-@@ -262,7 +273,7 @@ source "kernel/Kconfig.preempt"
+@@ -279,7 +290,7 @@ source "kernel/Kconfig.preempt"
config X86_UP_APIC
bool "Local APIC support on uniprocessors"
@@ -67,7 +68,7 @@
help
A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -287,12 +298,12 @@ config X86_UP_IOAPIC
+@@ -304,12 +315,12 @@ config X86_UP_IOAPIC
config X86_LOCAL_APIC
bool
@@ -82,7 +83,7 @@
default y
config X86_VISWS_APIC
-@@ -302,7 +313,7 @@ config X86_VISWS_APIC
+@@ -319,7 +330,7 @@ config X86_VISWS_APIC
config X86_MCE
bool "Machine Check Exception"
@@ -91,7 +92,7 @@
---help---
Machine Check Exception support allows the processor to notify the
kernel if it detects a problem (e.g. overheating, component failure).
-@@ -401,6 +412,7 @@ config X86_REBOOTFIXUPS
+@@ -418,6 +429,7 @@ config X86_REBOOTFIXUPS
config MICROCODE
tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -99,7 +100,7 @@
select FW_LOADER
---help---
If you say Y here and also to "/dev file system support" in the
-@@ -424,6 +436,7 @@ config MICROCODE_OLD_INTERFACE
+@@ -441,6 +453,7 @@ config MICROCODE_OLD_INTERFACE
config X86_MSR
tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -107,7 +108,7 @@
help
This device gives privileged processes access to the x86
Model-Specific Registers (MSRs). It is a character device with
-@@ -439,6 +452,10 @@ config X86_CPUID
+@@ -456,6 +469,10 @@ config X86_CPUID
with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
/dev/cpu/31/cpuid.
@@ -118,7 +119,7 @@
source "drivers/firmware/Kconfig"
choice
-@@ -611,7 +628,7 @@ source "mm/Kconfig"
+@@ -629,7 +646,7 @@ source "mm/Kconfig"
config HIGHPTE
bool "Allocate 3rd-level pagetables from highmem"
@@ -127,7 +128,7 @@
help
The VM uses one page table entry for each page of physical memory.
For systems with a lot of RAM, this can be wasteful of precious
-@@ -620,6 +637,7 @@ config HIGHPTE
+@@ -638,6 +655,7 @@ config HIGHPTE
config MATH_EMULATION
bool "Math emulation"
@@ -135,7 +136,7 @@
---help---
Linux can emulate a math coprocessor (used for floating point
operations) if you don't have one. 486DX and Pentium processors have
-@@ -645,6 +663,8 @@ config MATH_EMULATION
+@@ -663,6 +681,8 @@ config MATH_EMULATION
config MTRR
bool "MTRR (Memory Type Range Register) support"
@@ -144,7 +145,7 @@
---help---
On Intel P6 family processors (Pentium Pro, Pentium II and later)
the Memory Type Range Registers (MTRRs) may be used to control
-@@ -679,7 +699,7 @@ config MTRR
+@@ -697,7 +717,7 @@ config MTRR
config EFI
bool "Boot from EFI support"
@@ -153,7 +154,7 @@
default n
---help---
This enables the kernel to boot on EFI platforms using
-@@ -697,7 +717,7 @@ config EFI
+@@ -715,7 +735,7 @@ config EFI
config IRQBALANCE
bool "Enable kernel irq balancing"
@@ -162,7 +163,7 @@
default y
help
The default yes will allow the kernel to do irq load balancing.
-@@ -745,6 +765,7 @@ source kernel/Kconfig.hz
+@@ -749,6 +769,7 @@ source kernel/Kconfig.hz
config KEXEC
bool "kexec system call"
@@ -170,7 +171,7 @@
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
-@@ -804,7 +825,7 @@ config HOTPLUG_CPU
+@@ -865,7 +886,7 @@ config HOTPLUG_CPU
config COMPAT_VDSO
bool "Compat VDSO support"
default y
@@ -179,7 +180,7 @@
help
Map the VDSO to the predictable old-style address too.
---help---
-@@ -821,18 +842,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+@@ -882,18 +903,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
depends on HIGHMEM
menu "Power management options (ACPI, APM)"
@@ -203,7 +204,7 @@
---help---
APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with
-@@ -1017,6 +1040,7 @@ choice
+@@ -1078,6 +1101,7 @@ choice
config PCI_GOBIOS
bool "BIOS"
@@ -211,7 +212,7 @@
config PCI_GOMMCONFIG
bool "MMConfig"
-@@ -1024,6 +1048,13 @@ config PCI_GOMMCONFIG
+@@ -1085,6 +1109,13 @@ config PCI_GOMMCONFIG
config PCI_GODIRECT
bool "Direct"
@@ -225,7 +226,7 @@
config PCI_GOANY
bool "Any"
-@@ -1031,7 +1062,7 @@ endchoice
+@@ -1092,7 +1123,7 @@ endchoice
[...73215 lines suppressed...]
} \
}
@@ -94572,7 +87210,7 @@
/**
* dev_queue_xmit - transmit a buffer
* @skb: buffer to transmit
-@@ -1425,6 +1468,12 @@ int dev_queue_xmit(struct sk_buff *skb)
+@@ -1424,6 +1467,12 @@ int dev_queue_xmit(struct sk_buff *skb)
struct Qdisc *q;
int rc = -ENOMEM;
@@ -94585,7 +87223,7 @@
/* GSO will handle the following emulations directly. */
if (netif_needs_gso(dev, skb))
goto gso;
-@@ -1800,6 +1849,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1799,6 +1848,19 @@ int netif_receive_skb(struct sk_buff *sk
}
#endif
@@ -94605,7 +87243,7 @@
list_for_each_entry_rcu(ptype, &ptype_all, list) {
if (!ptype->dev || ptype->dev == skb->dev) {
if (pt_prev)
-@@ -3586,6 +3648,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+@@ -3563,6 +3625,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
EXPORT_SYMBOL(net_enable_timestamp);
EXPORT_SYMBOL(net_disable_timestamp);
EXPORT_SYMBOL(dev_get_flags);
@@ -94613,18 +87251,18 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-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);
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/net/core/skbuff.c linux-2.6.20-xen-3.0.3/net/core/skbuff.c
+--- /scratch/src/linux-2.6.20.2/net/core/skbuff.c 2007-02-04 19:44:54.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/net/core/skbuff.c 2007-03-12 23:44:03.000000000 +0100
+@@ -141,6 +141,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
*/
+#ifndef CONFIG_HAVE_ARCH_ALLOC_SKB
struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
- int fclone)
+ int fclone, int node)
{
-@@ -194,6 +195,7 @@ nodata:
+@@ -196,6 +197,7 @@ nodata:
skb = NULL;
goto out;
}
@@ -94632,15 +87270,15 @@
/**
* alloc_skb_from_cache - allocate a network buffer
-@@ -211,14 +213,17 @@ nodata:
+@@ -213,14 +215,17 @@ nodata:
*/
- struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
+ struct sk_buff *alloc_skb_from_cache(struct kmem_cache *cp,
unsigned int size,
- gfp_t gfp_mask)
+ gfp_t gfp_mask,
+ int fclone)
{
-+ kmem_cache_t *cache;
++ struct kmem_cache *cache;
struct sk_buff *skb;
u8 *data;
@@ -94653,7 +87291,7 @@
if (!skb)
goto out;
-@@ -242,10 +247,20 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -244,10 +249,20 @@ struct sk_buff *alloc_skb_from_cache(str
skb_shinfo(skb)->gso_segs = 0;
skb_shinfo(skb)->gso_type = 0;
skb_shinfo(skb)->frag_list = NULL;
@@ -94675,7 +87313,7 @@
skb = NULL;
goto out;
}
-@@ -465,6 +480,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -468,6 +483,10 @@ struct sk_buff *skb_clone(struct sk_buff
C(local_df);
n->cloned = 1;
n->nohdr = 0;
@@ -94686,51 +87324,48 @@
C(pkt_type);
C(ip_summed);
C(priority);
-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,
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.20-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- /scratch/src/linux-2.6.20.2/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-02-04 19:44:54.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-01-24 01:43:11.000000000 +0100
+@@ -129,8 +129,15 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
+#ifdef CONFIG_XEN
+ if ((*pskb)->proto_csum_blank)
-+ hdr->check = ~nf_csum_update(~oldip, newip, hdr->check);
++ nf_csum_replace4(&hdr->check, oldip, newip);
+ else
+#endif
+ {
- hdr->check = nf_proto_csum_update(*pskb, ~oldip, newip, hdr->check, 1);
- hdr->check = nf_proto_csum_update(*pskb, oldport ^ htons(0xFFFF), newport,
- hdr->check, 0);
+ nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
+ nf_proto_csum_replace2(&hdr->check, *pskb, oldport, newport, 0);
+ }
return 1;
}
-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,
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.20-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- /scratch/src/linux-2.6.20.2/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-02-04 19:44:54.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-01-24 01:43:11.000000000 +0100
+@@ -115,8 +115,16 @@ udp_manip_pkt(struct sk_buff **pskb,
}
if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) {
+#ifdef CONFIG_XEN
+ if ((*pskb)->proto_csum_blank)
-+ hdr->check = ~nf_csum_update(~oldip, newip, hdr->check);
++ nf_csum_replace4(&hdr->check, oldip, newip);
+ else
+#endif
+ {
- hdr->check = nf_proto_csum_update(*pskb, ~oldip, newip,
- hdr->check, 1);
- hdr->check = nf_proto_csum_update(*pskb,
- *portptr ^ htons(0xFFFF), newport,
- hdr->check, 0);
+ nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
+ nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, 0);
+ }
++
if (!hdr->check)
- hdr->check = -1;
+ hdr->check = CSUM_MANGLED_0;
}
-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
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/net/ipv4/xfrm4_output.c linux-2.6.20-xen-3.0.3/net/ipv4/xfrm4_output.c
+--- /scratch/src/linux-2.6.20.2/net/ipv4/xfrm4_output.c 2007-02-04 19:44:54.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/net/ipv4/xfrm4_output.c 2007-01-24 01:43:11.000000000 +0100
@@ -18,6 +18,8 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -94751,10 +87386,10 @@
if (skb->ip_summed == CHECKSUM_PARTIAL) {
err = skb_checksum_help(skb);
if (err)
-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
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/net/ipv6/addrconf.c linux-2.6.20-xen-3.0.3/net/ipv6/addrconf.c
+--- /scratch/src/linux-2.6.20.2/net/ipv6/addrconf.c 2007-03-12 23:39:35.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/net/ipv6/addrconf.c 2007-03-12 23:44:03.000000000 +0100
+@@ -2553,6 +2553,8 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
@@ -94763,7 +87398,7 @@
!(ifp->flags&IFA_F_TENTATIVE) ||
ifp->flags & IFA_F_NODAD) {
ifp->flags &= ~IFA_F_TENTATIVE;
-@@ -2630,6 +2632,7 @@ static void addrconf_dad_completed(struc
+@@ -2638,6 +2640,7 @@ static void addrconf_dad_completed(struc
if (ifp->idev->cnf.forwarding == 0 &&
ifp->idev->cnf.rtr_solicits > 0 &&
(dev->flags&IFF_LOOPBACK) == 0 &&
@@ -94771,9 +87406,9 @@
(ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
struct in6_addr all_routers;
-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
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.20.2/scripts/Makefile.xen linux-2.6.20-xen-3.0.3/scripts/Makefile.xen
+--- /scratch/src/linux-2.6.20.2/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.20-xen-3.0.3/scripts/Makefile.xen 2007-01-24 01:43:14.000000000 +0100
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- sources 13 Mar 2007 23:06:11 -0000 1.519
+++ sources 14 Mar 2007 01:42:25 -0000 1.520
@@ -2,3 +2,4 @@
5739512c396b37d9506bca2afe5aaa1d patch-2.6.20.1.bz2
8445b2544410648bc228bc12839d921e patch-2.6.20.1-2.bz2
8425cead82afc782e2a3866a287a61fe patch-2.6.20.2-3.bz2
+a9d44b2651b0898e103395b2a7a4f263 xen-3.0.3-11774.tar.bz2
--- linux-2.6-ia64-kexec-kdump-xen-conflict.patch DELETED ---
--- linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch DELETED ---
- Previous message (by thread): rpms/kernel/FC-6/scripts rebase-xen-kernel.sh,1.9,1.10
- Next message (by thread): rpms/kernel/FC-5 .cvsignore, 1.436, 1.437 kernel-2.6.spec, 1.2301, 1.2302 linux-2.6-devmem.patch, 1.11, 1.12 linux-2.6-xen-execshield.patch, 1.2, 1.3 linux-2.6-xen.patch, 1.31, 1.32 sources, 1.376, 1.377 linux-2.6-ia64-kexec-kdump-xen-conflict.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list