rpms/kernel/FC-6 kernel-2.6.spec, 1.2871, 1.2872 linux-2.6-debug-sysfs-crash-debugging-xen.patch, 1.1, 1.2 linux-2.6-defaults-disable-split-ptlock.patch, 1.4, 1.5 linux-2.6-devmem.patch, 1.12, 1.13 linux-2.6-xen-execshield.patch, 1.1, 1.2 linux-2.6-xen.patch, 1.82, 1.83
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Dec 24 00:48:38 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv12018
Modified Files:
kernel-2.6.spec
linux-2.6-debug-sysfs-crash-debugging-xen.patch
linux-2.6-defaults-disable-split-ptlock.patch
linux-2.6-devmem.patch linux-2.6-xen-execshield.patch
linux-2.6-xen.patch
Log Message:
rebase xen to 2.6.19.1
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2871
retrieving revision 1.2872
diff -u -r1.2871 -r1.2872
--- kernel-2.6.spec 21 Dec 2006 21:53:46 -0000 1.2871
+++ kernel-2.6.spec 24 Dec 2006 00:48:31 -0000 1.2872
@@ -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
@@ -77,7 +77,7 @@
# Xen only builds on i686, x86_64 and ia64 ...
%ifnarch i686 x86_64 ia64
-%define buildxen 0
+%define buildxen 1
%endif
# Second, per-architecture exclusions (ifarch)
@@ -364,11 +364,9 @@
Patch950: linux-2.6-xen.patch
Patch951: linux-2.6-xen-utrace.patch
Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
-Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.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-x86-unwinder.patch
Patch990: linux-2.6-xen-pvfb.patch
#
@@ -847,14 +845,11 @@
# Xen utrace
%patch951 -p1
%patch952 -p1
-%patch953 -p1
# Xen exec-shield bits
%patch954 -p1
%patch955 -p1
# ia64 xen cleanups for kexec/kdump
%patch958 -p1
-# Unwinder fixes for Xen.
-%patch959 -p1
# xen framebuffer patches
%patch990 -p1
@@ -1851,6 +1846,9 @@
%endif
%changelog
+* Sun Dec 24 2006 Juan Quintela <quintela at redhat.com>
+- 2.6.19.1 xen update.
+
* Thu Dec 21 2006 Dave Jones <davej at redhat.com>
- 2.6.19.1
linux-2.6-debug-sysfs-crash-debugging-xen.patch:
arch/i386/kernel/traps-xen.c | 5 +++++
linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c | 5 +++++
2 files changed, 10 insertions(+)
Index: linux-2.6-debug-sysfs-crash-debugging-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-debug-sysfs-crash-debugging-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-sysfs-crash-debugging-xen.patch 27 Jul 2006 13:05:34 -0000 1.1
+++ linux-2.6-debug-sysfs-crash-debugging-xen.patch 24 Dec 2006 00:48:31 -0000 1.2
@@ -26,19 +26,19 @@
if (notify_die(DIE_OOPS, str, regs, err,
current->thread.trap_no, SIGSEGV) !=
NOTIFY_STOP) {
-diff -r 35d3d547d0d3 -r e5168f3eb0de arch/x86_64/kernel/traps-xen.c
---- a/arch/x86_64/kernel/traps-xen.c Thu Jul 27 00:46:20 2006 +0200
-+++ b/arch/x86_64/kernel/traps-xen.c Thu Jul 27 00:59:37 2006 +0200
-@@ -69,6 +69,8 @@ asmlinkage void spurious_interrupt_bug(v
- asmlinkage void spurious_interrupt_bug(void);
-
+diff -uNp linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c.orig linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c
+--- linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c.orig 2006-12-23 21:21:30.000000000 +0100
++++ linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c 2006-12-23 21:23:13.000000000 +0100
+@@ -73,6 +73,8 @@ asmlinkage void spurious_interrupt_bug(v
ATOMIC_NOTIFIER_HEAD(die_chain);
-+
-+extern char last_sysfs_file[];
+ EXPORT_SYMBOL(die_chain);
++extern char last_sysfs_file[];
++
int register_die_notifier(struct notifier_block *nb)
{
-@@ -537,6 +539,9 @@ void __kprobes __die(const char * str, s
+ vmalloc_sync_all();
+@@ -607,6 +609,9 @@ void __kprobes __die(const char * str, s
printk("DEBUG_PAGEALLOC");
#endif
printk("\n");
linux-2.6-defaults-disable-split-ptlock.patch:
Kconfig | 1 +
1 files changed, 1 insertion(+)
Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-defaults-disable-split-ptlock.patch 21 Dec 2006 21:45:13 -0000 1.4
+++ linux-2.6-defaults-disable-split-ptlock.patch 24 Dec 2006 00:48:31 -0000 1.5
@@ -1,10 +1,11 @@
---- linux-2.6.19.noarch/mm/Kconfig~ 2006-12-18 13:35:48.000000000 -0500
-+++ linux-2.6.19.noarch/mm/Kconfig 2006-12-18 13:36:05.000000000 -0500
-@@ -137,6 +137,7 @@ config SPLIT_PTLOCK_CPUS
+diff -uNp linux-2.6.19.noarch/mm/Kconfig.orig linux-2.6.19.noarch/mm/Kconfig
+--- linux-2.6.19.noarch/mm/Kconfig.orig 2006-12-23 21:32:06.000000000 +0100
++++ linux-2.6.19.noarch/mm/Kconfig 2006-12-23 21:33:18.000000000 +0100
+@@ -139,6 +139,7 @@ config SPLIT_PTLOCK_CPUS
int
default "4096" if ARM && !CPU_CACHE_VIPT
default "4096" if PARISC && !PA20
+ default "4096" if !64BIT
+ default "4096" if X86_XEN || X86_64_XEN
default "4"
- #
linux-2.6-devmem.patch:
include/asm-m68k/page.h | 2
linux-2.6.19.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-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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-devmem.patch 21 Dec 2006 21:45:13 -0000 1.12
+++ linux-2.6-devmem.patch 24 Dec 2006 00:48:31 -0000 1.13
@@ -442,18 +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)
- (((current->personality & READ_IMPLIES_EXEC) != 0) \
- ? VM_EXEC : 0))
+diff -uNp linux-2.6.19.noarch/include/asm-ia64/page.h.orig linux-2.6.19.noarch/include/asm-ia64/page.h
+--- linux-2.6.19.noarch/include/asm-ia64/page.h.orig 2006-12-23 21:24:24.000000000 +0100
++++ linux-2.6.19.noarch/include/asm-ia64/page.h 2006-12-23 21:30:02.000000000 +0100
+@@ -277,5 +277,6 @@ extern struct address_space xen_ia64_for
+ #endif /* CONFIG_XEN */
+ #endif /* __ASSEMBLY__ */
+#define devmem_is_allowed(x) 1
- # endif /* __KERNEL__ */
+ #endif /* __KERNEL__ */
#endif /* _ASM_IA64_PAGE_H */
-Index: linux-2.6/include/asm-m68k/page.h
+
===================================================================
--- linux-2.6.orig/include/asm-m68k/page.h
+++ linux-2.6/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/ia32/syscall32-xen.c | 4 -
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/desc.h | 14 ++++
include/asm-i386/mach-xen/asm/mmu.h | 4 +
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 +
14 files changed, 206 insertions(+), 51 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-execshield.patch 26 Jul 2006 04:08:13 -0000 1.1
+++ linux-2.6-xen-execshield.patch 24 Dec 2006 00:48:31 -0000 1.2
@@ -235,9 +235,9 @@
if (!fixup_exception(regs)) {
if (notify_die(DIE_GPF, "general protection fault", regs,
error_code, 13, SIGSEGV) == NOTIFY_STOP)
-diff -r 095d53b0d1a6 arch/i386/mm/init-xen.c
---- a/arch/i386/mm/init-xen.c Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/i386/mm/init-xen.c Tue Jul 25 23:02:25 2006 +0200
+diff -uNp linux-2.6.19.noarch/arch/i386/mm/init-xen.c.orig linux-2.6.19.noarch/arch/i386/mm/init-xen.c
+--- linux-2.6.19.noarch/arch/i386/mm/init-xen.c.orig 2006-12-23 20:55:44.000000000 +0100
++++ linux-2.6.19.noarch/arch/i386/mm/init-xen.c 2006-12-23 21:12:52.000000000 +0100
@@ -465,7 +465,7 @@ EXPORT_SYMBOL(__supported_pte_mask);
* Control non executable mappings.
*
@@ -245,23 +245,22 @@
- * off Disable
+ * off Disable (disables exec-shield too)
*/
- void __init noexec_setup(const char *str)
+ static int __init noexec_setup(char *str)
{
-@@ -475,6 +475,7 @@ void __init noexec_setup(const char *str
- } else if (!strncmp(str,"off",3)) {
+@@ -477,6 +477,7 @@ static int __init noexec_setup(char *str
+ } else if (!strcmp(str,"off")) {
disable_nx = 1;
__supported_pte_mask &= ~_PAGE_NX;
+ exec_shield = 0;
- }
- }
+ } else
+ return -EINVAL;
-@@ -541,7 +542,10 @@ void __init paging_init(void)
+@@ -548,7 +549,10 @@ void __init paging_init(void)
set_nx();
if (nx_enabled)
printk("NX (Execute Disable) protection: active\n");
--#endif
+ else
-+#endif
+ #endif
+ if (exec_shield)
+ printk("Using x86 segment limits to approximate NX protection\n");
@@ -297,25 +296,33 @@
}
asmlinkage long sys_fork(struct pt_regs *regs)
-diff -r 095d53b0d1a6 arch/x86_64/kernel/setup64-xen.c
---- a/arch/x86_64/kernel/setup64-xen.c Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/x86_64/kernel/setup64-xen.c Tue Jul 25 23:02:25 2006 +0200
-@@ -55,7 +55,7 @@ on Enable(default)
- on Enable(default)
- off Disable
- */
--int __init nonx_setup(char *str)
-+void __init nonx_setup(char *str)
- {
- if (!strncmp(str, "on", 2)) {
- __supported_pte_mask |= _PAGE_NX;
-@@ -64,28 +64,7 @@ int __init nonx_setup(char *str)
- do_not_nx = 1;
- __supported_pte_mask &= ~_PAGE_NX;
- }
-- return 1;
+diff
+--- linux-2.6.orig/arch/x86_64/kernel/setup64-xen.c
++++ linux-2.6/arch/x86_64/kernel/setup64-xen.c
+@@ -40,46 +40,6 @@ unsigned long __supported_pte_mask __rea
+ EXPORT_SYMBOL(__supported_pte_mask);
+ static int do_not_nx __cpuinitdata = 0;
+
+-/* noexec=on|off
+-Control non executable mappings for 64bit processes.
+-
+-on Enable(default)
+-off Disable
+-*/
+-static int __init nonx_setup(char *str)
+-{
+- if (!str)
+- return -EINVAL;
+- if (!strncmp(str, "on", 2)) {
+- __supported_pte_mask |= _PAGE_NX;
+- do_not_nx = 0;
+- } else if (!strncmp(str, "off", 3)) {
+- do_not_nx = 1;
+- __supported_pte_mask &= ~_PAGE_NX;
+- }
+- return 0;
-}
--__setup("noexec=", nonx_setup); /* parsed early actually */
+-early_param("noexec", nonx_setup);
-
-int force_personality32 = 0;
-
@@ -335,10 +342,10 @@
- return 1;
-}
-__setup("noexec32=", nonx32_setup);
-+}
-
+-
/*
* Great future plan:
+ * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
diff -r 095d53b0d1a6 arch/x86_64/mm/fault-xen.c
--- a/arch/x86_64/mm/fault-xen.c Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/x86_64/mm/fault-xen.c Tue Jul 25 23:02:25 2006 +0200
@@ -448,15 +455,3 @@
void make_page_readonly(void *va, unsigned int feature);
void make_page_writable(void *va, unsigned int feature);
void make_pages_readonly(void *va, unsigned int nr, unsigned int feature);
-diff -r 095d53b0d1a6 include/asm-x86_64/mach-xen/asm/pgtable.h
---- a/include/asm-x86_64/mach-xen/asm/pgtable.h Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-x86_64/mach-xen/asm/pgtable.h Tue Jul 25 23:02:25 2006 +0200
-@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas
-
- #define swapper_pg_dir init_level4_pgt
-
--extern int nonx_setup(char *str);
-+extern void nonx_setup(char *str);
- extern void paging_init(void);
- extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
-
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 | 847 +++++
arch/i386/kernel/quirks-xen.c | 47
arch/i386/kernel/setup-xen.c | 1734 +++++++++++
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 | 855 +++++
arch/x86_64/kernel/setup-xen.c | 1469 +++++++++
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 | 7
drivers/firmware/Kconfig | 2
drivers/ide/ide-lib.c | 8
drivers/oprofile/buffer_sync.c | 66
drivers/oprofile/cpu_buffer.c | 51
drivers/oprofile/cpu_buffer.h | 9
drivers/oprofile/event_buffer.h | 7
drivers/oprofile/oprof.c | 32
drivers/oprofile/oprof.h | 3
drivers/oprofile/oprofile_files.c | 207 +
drivers/pci/Kconfig | 1
drivers/serial/Kconfig | 1
drivers/xen/Kconfig | 260 +
drivers/xen/Makefile | 17
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 637 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 549 +++
drivers/xen/blkback/common.h | 133
drivers/xen/blkback/interface.c | 171 +
drivers/xen/blkback/vbd.c | 119
drivers/xen/blkback/xenbus.c | 468 +++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 846 +++++
drivers/xen/blkfront/block.h | 154 +
drivers/xen/blkfront/vbd.c | 318 ++
drivers/xen/blktap/Makefile | 6
drivers/xen/blktap/blktapmain.c | 1393 +++++++++
drivers/xen/blktap/common.h | 120
drivers/xen/blktap/interface.c | 164 +
drivers/xen/blktap/xenbus.c | 366 ++
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 180 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 687 ++++
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/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 | 36
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 | 207 +
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/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
415 files changed, 87968 insertions(+), 200 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.82 -r 1.83 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.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- linux-2.6-xen.patch 7 Dec 2006 20:51:06 -0000 1.82
+++ linux-2.6-xen.patch 24 Dec 2006 00:48:31 -0000 1.83
@@ -1,8 +1,7 @@
- * linux-2.6.18-xen changeset: 36192:9d376c854d17
- * ../upstream/xen-3.0.3-testing changeset: 11774:52ae8dd4bc75
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/arch/i386/boot-xen/Makefile linux-2.6.18-xen/arch/i386/boot-xen/Makefile
---- /scratch/src/linux-2.6.18.5/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.18-xen/arch/i386/boot-xen/Makefile 2006-12-07 19:47:32.000000000 +0100
+ * 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
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -25,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='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/arch/i386/Kconfig linux-2.6.18-xen/arch/i386/Kconfig
---- /scratch/src/linux-2.6.18.5/arch/i386/Kconfig 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.18-xen/arch/i386/Kconfig 2006-12-07 19:47:32.000000000 +0100
+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
@@ -16,6 +16,7 @@ config X86_32
config GENERIC_TIME
@@ -52,7 +51,7 @@
config X86_ELAN
bool "AMD Elan"
help
-@@ -213,6 +223,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -212,6 +222,7 @@ source "arch/i386/Kconfig.cpu"
config HPET_TIMER
bool "HPET Timer Support"
@@ -60,31 +59,31 @@
help
This enables the use of the HPET for the kernel's internal timer.
HPET is the next generation timer replacing legacy 8254s.
-@@ -263,7 +274,7 @@ source "kernel/Kconfig.preempt"
+@@ -262,7 +273,7 @@ source "kernel/Kconfig.preempt"
config X86_UP_APIC
bool "Local APIC support on uniprocessors"
-- depends on !SMP && !(X86_VISWS || X86_VOYAGER)
-+ depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
+- depends on !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH)
++ depends on !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH || XEN_UNPRIVILEGED_GUEST)
help
A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -288,12 +299,12 @@ config X86_UP_IOAPIC
+@@ -287,12 +298,12 @@ config X86_UP_IOAPIC
config X86_LOCAL_APIC
bool
-- depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
-+ depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
+- depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) || X86_GENERICARCH
++ depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) || X86_GENERICARCH
default y
config X86_IO_APIC
bool
-- depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
-+ depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
+- depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) || X86_GENERICARCH
++ depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) || X86_GENERICARCH
default y
config X86_VISWS_APIC
-@@ -303,7 +314,7 @@ config X86_VISWS_APIC
+@@ -302,7 +313,7 @@ config X86_VISWS_APIC
config X86_MCE
bool "Machine Check Exception"
@@ -93,15 +92,15 @@
---help---
Machine Check Exception support allows the processor to notify the
kernel if it detects a problem (e.g. overheating, component failure).
-@@ -402,6 +413,7 @@ config X86_REBOOTFIXUPS
+@@ -401,6 +412,7 @@ config X86_REBOOTFIXUPS
config MICROCODE
tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
+ depends on !XEN_UNPRIVILEGED_GUEST
+ select FW_LOADER
---help---
If you say Y here and also to "/dev file system support" in the
- 'File systems' section, you will be able to update the microcode on
-@@ -419,6 +431,7 @@ config MICROCODE
+@@ -424,6 +436,7 @@ config MICROCODE_OLD_INTERFACE
config X86_MSR
tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -109,7 +108,7 @@
help
This device gives privileged processes access to the x86
Model-Specific Registers (MSRs). It is a character device with
-@@ -434,6 +447,10 @@ config X86_CPUID
+@@ -439,6 +452,10 @@ config X86_CPUID
with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
/dev/cpu/31/cpuid.
@@ -120,7 +119,7 @@
source "drivers/firmware/Kconfig"
choice
-@@ -607,7 +624,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -611,7 +628,7 @@ source "mm/Kconfig"
config HIGHPTE
bool "Allocate 3rd-level pagetables from highmem"
@@ -129,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
-@@ -616,6 +633,7 @@ config HIGHPTE
+@@ -620,6 +637,7 @@ config HIGHPTE
config MATH_EMULATION
bool "Math emulation"
@@ -137,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
-@@ -641,6 +659,8 @@ config MATH_EMULATION
+@@ -645,6 +663,8 @@ config MATH_EMULATION
config MTRR
bool "MTRR (Memory Type Range Register) support"
@@ -146,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
-@@ -675,7 +695,7 @@ config MTRR
+@@ -679,7 +699,7 @@ config MTRR
config EFI
bool "Boot from EFI support"
@@ -154,8 +153,8 @@
+ depends on ACPI && !X86_XEN
default n
---help---
- This enables the the kernel to boot on EFI platforms using
-@@ -693,7 +713,7 @@ config EFI
+ This enables the kernel to boot on EFI platforms using
+@@ -697,7 +717,7 @@ config EFI
config IRQBALANCE
bool "Enable kernel irq balancing"
@@ -164,24 +163,24 @@
default y
help
The default yes will allow the kernel to do irq load balancing.
-@@ -741,7 +761,7 @@ source kernel/Kconfig.hz
+@@ -745,6 +765,7 @@ source kernel/Kconfig.hz
config KEXEC
- bool "kexec system call (EXPERIMENTAL)"
-- depends on EXPERIMENTAL
-+ depends on EXPERIMENTAL && !X86_XEN
+ bool "kexec system call"
++ depends on !X86_XEN
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
-@@ -794,6 +814,7 @@ config HOTPLUG_CPU
+@@ -804,7 +825,7 @@ config HOTPLUG_CPU
config COMPAT_VDSO
bool "Compat VDSO support"
default y
+- depends on !PARAVIRT
+ depends on !X86_XEN
help
Map the VDSO to the predictable old-style address too.
---help---
-@@ -810,18 +831,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+@@ -821,18 +842,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
depends on HIGHMEM
menu "Power management options (ACPI, APM)"
@@ -205,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
-@@ -1006,6 +1029,7 @@ choice
+@@ -1017,6 +1040,7 @@ choice
config PCI_GOBIOS
bool "BIOS"
@@ -213,7 +212,7 @@
[...19742 lines suppressed...]
int rc = -ENOMEM;
@@ -92509,7 +91826,7 @@
/* GSO will handle the following emulations directly. */
if (netif_needs_gso(dev, skb))
goto gso;
-@@ -1798,6 +1847,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1800,6 +1849,19 @@ int netif_receive_skb(struct sk_buff *sk
}
#endif
@@ -92518,7 +91835,7 @@
+ case CHECKSUM_UNNECESSARY:
+ skb->proto_data_valid = 1;
+ break;
-+ case CHECKSUM_HW:
++ case CHECKSUM_PARTIAL:
+ /* XXX Implement me. */
+ default:
+ skb->proto_data_valid = 0;
@@ -92529,7 +91846,7 @@
list_for_each_entry_rcu(ptype, &ptype_all, list) {
if (!ptype->dev || ptype->dev == skb->dev) {
if (pt_prev)
-@@ -3584,6 +3646,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+@@ -3586,6 +3648,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
EXPORT_SYMBOL(net_enable_timestamp);
EXPORT_SYMBOL(net_disable_timestamp);
EXPORT_SYMBOL(dev_get_flags);
@@ -92537,9 +91854,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.18.5/net/core/skbuff.c linux-2.6.18-xen/net/core/skbuff.c
---- /scratch/src/linux-2.6.18.5/net/core/skbuff.c 2006-12-07 18:25:12.000000000 +0100
-+++ linux-2.6.18-xen/net/core/skbuff.c 2006-12-07 19:48:33.000000000 +0100
+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
@@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
@@ -92548,7 +91865,7 @@
struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
int fclone)
{
-@@ -193,6 +194,7 @@ nodata:
+@@ -194,6 +195,7 @@ nodata:
skb = NULL;
goto out;
}
@@ -92556,7 +91873,7 @@
/**
* alloc_skb_from_cache - allocate a network buffer
-@@ -210,14 +212,17 @@ nodata:
+@@ -211,14 +213,17 @@ nodata:
*/
struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
unsigned int size,
@@ -92577,7 +91894,7 @@
if (!skb)
goto out;
-@@ -241,10 +246,20 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -242,10 +247,20 @@ struct sk_buff *alloc_skb_from_cache(kme
skb_shinfo(skb)->gso_segs = 0;
skb_shinfo(skb)->gso_type = 0;
skb_shinfo(skb)->frag_list = NULL;
@@ -92599,7 +91916,7 @@
skb = NULL;
goto out;
}
-@@ -464,6 +479,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -465,6 +480,10 @@ struct sk_buff *skb_clone(struct sk_buff
C(local_df);
n->cloned = 1;
n->nohdr = 0;
@@ -92610,43 +91927,51 @@
C(pkt_type);
C(ip_summed);
C(priority);
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-07 19:48:34.000000000 +0100
-@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
+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
+@@ -129,9 +129,16 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
-- hdr->check = ip_nat_cheat_check(~oldip, newip,
+#ifdef CONFIG_XEN
+ if ((*pskb)->proto_csum_blank)
-+ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
++ hdr->check = ~nf_csum_update(~oldip, newip, hdr->check);
+ else
+#endif
-+ hdr->check = ip_nat_cheat_check(~oldip, newip,
- ip_nat_cheat_check(oldport ^ 0xFFFF,
- newport,
- hdr->check));
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_udp.c
---- /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-07 19:48:34.000000000 +0100
-@@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
- portptr = &hdr->dest;
++ {
+ 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);
++ }
+ 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
+@@ -115,11 +115,18 @@ udp_manip_pkt(struct sk_buff **pskb,
}
- if (hdr->check) /* 0 is a special case meaning no checksum */
-- hdr->check = ip_nat_cheat_check(~oldip, newip,
+
+ if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) {
+#ifdef CONFIG_XEN
+ if ((*pskb)->proto_csum_blank)
-+ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
++ hdr->check = ~nf_csum_update(~oldip, newip, hdr->check);
+ else
+#endif
-+ hdr->check = ip_nat_cheat_check(~oldip, newip,
- ip_nat_cheat_check(*portptr ^ 0xFFFF,
- newport,
- hdr->check));
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/ipv4/xfrm4_output.c linux-2.6.18-xen/net/ipv4/xfrm4_output.c
---- /scratch/src/linux-2.6.18.5/net/ipv4/xfrm4_output.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.18-xen/net/ipv4/xfrm4_output.c 2006-12-07 19:48:34.000000000 +0100
++ {
+ 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);
++ }
+ 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
@@ -18,6 +18,8 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -92664,21 +91989,22 @@
+ if (err)
+ goto error_nolock;
+
- if (skb->ip_summed == CHECKSUM_HW) {
- err = skb_checksum_help(skb, 0);
+ 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.18.5/net/ipv6/addrconf.c linux-2.6.18-xen/net/ipv6/addrconf.c
---- /scratch/src/linux-2.6.18.5/net/ipv6/addrconf.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.18-xen/net/ipv6/addrconf.c 2006-12-07 19:48:34.000000000 +0100
-@@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
+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
+@@ -2545,6 +2545,8 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
++
+ !(dev->flags&IFF_MULTICAST) ||
- !(ifp->flags&IFA_F_TENTATIVE)) {
+ !(ifp->flags&IFA_F_TENTATIVE) ||
+ ifp->flags & IFA_F_NODAD) {
ifp->flags &= ~IFA_F_TENTATIVE;
- spin_unlock_bh(&ifp->lock);
-@@ -2598,6 +2599,7 @@ static void addrconf_dad_completed(struc
+@@ -2630,6 +2632,7 @@ static void addrconf_dad_completed(struc
if (ifp->idev->cnf.forwarding == 0 &&
ifp->idev->cnf.rtr_solicits > 0 &&
(dev->flags&IFF_LOOPBACK) == 0 &&
@@ -92686,9 +92012,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.18.5/scripts/Makefile.xen linux-2.6.18-xen/scripts/Makefile.xen
---- /scratch/src/linux-2.6.18.5/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.18-xen/scripts/Makefile.xen 2006-12-07 19:48:36.000000000 +0100
+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
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
More information about the fedora-cvs-commits
mailing list