diff options
| author |   Michael Marineau <marineam@gentoo.org> | 2007-11-17 00:45:57 +0000 |
|---|---|---|
| committer | Michael Marineau <marineam@gentoo.org> | 2007-11-17 00:45:57 +0000 |
| commit | 9070af7e722ad149e290f9c6f3645c04ec770897 (patch) | |
| tree | a3e4c6847f109ed15bb95d0883cbb6159ac2c2d8 | |
| parent | Releasing 2.6.18-7 (diff) | |
| download | xen-9070af7e722ad149e290f9c6f3645c04ec770897.tar.gz xen-9070af7e722ad149e290f9c6f3645c04ec770897.tar.bz2 xen-9070af7e722ad149e290f9c6f3645c04ec770897.zip | |
Bump to patch from Xen 3.1.2
svn path=/patches/; revision=60
| -rw-r--r-- | trunk/2.6.18/00000_README | 4 | ||||
| -rw-r--r-- | trunk/2.6.18/10001_xen-3.1.2.patch (renamed from trunk/2.6.18/10001_xen-3.1.1.patch) | 1031 |
2 files changed, 530 insertions, 505 deletions
diff --git a/trunk/2.6.18/00000_README b/trunk/2.6.18/00000_README index 96c5473..ca16f8b 100644 --- a/trunk/2.6.18/00000_README +++ b/trunk/2.6.18/00000_README @@ -19,8 +19,8 @@ Numbering Patches ------- -10001_xen-3.1.1.patch - Upstream 3.1.1 patch +10001_xen-3.1.2.patch + Upstream 3.1.2 patch 10002_i386-fix-xen_l1_entry_update-for-highptes.patch Fix for kernels compiled with CONFIG_HIGHPTE. diff --git a/trunk/2.6.18/10001_xen-3.1.1.patch b/trunk/2.6.18/10001_xen-3.1.2.patch index 527bc7a..099033d 100644 --- a/trunk/2.6.18/10001_xen-3.1.1.patch +++ b/trunk/2.6.18/10001_xen-3.1.2.patch @@ -1,6 +1,6 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/Kconfig tmp-linux-2.6-xen.patch/arch/i386/Kconfig --- pristine-linux-2.6.18/arch/i386/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -16,6 +16,7 @@ config X86_32 config GENERIC_TIME @@ -274,7 +274,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/Kconfig tmp-linux-2.6-xen.patch/arch/ default y diff -Nurp pristine-linux-2.6.18/arch/i386/Kconfig.cpu tmp-linux-2.6-xen.patch/arch/i386/Kconfig.cpu --- pristine-linux-2.6.18/arch/i386/Kconfig.cpu 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig.cpu 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig.cpu 2007-11-14 15:35:27.000000000 -0800 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -293,7 +293,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/Kconfig.cpu tmp-linux-2.6-xen.patch/a default y diff -Nurp pristine-linux-2.6.18/arch/i386/Kconfig.debug tmp-linux-2.6-xen.patch/arch/i386/Kconfig.debug --- pristine-linux-2.6.18/arch/i386/Kconfig.debug 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig.debug 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig.debug 2007-11-14 15:35:27.000000000 -0800 @@ -79,6 +79,7 @@ config X86_MPPARSE config DOUBLEFAULT default y @@ -304,7 +304,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/Kconfig.debug tmp-linux-2.6-xen.patch would otherwise cause a system to silently reboot. Disabling this diff -Nurp pristine-linux-2.6.18/arch/i386/Makefile tmp-linux-2.6-xen.patch/arch/i386/Makefile --- pristine-linux-2.6.18/arch/i386/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -48,6 +48,11 @@ CFLAGS += $(shell if [ $(call cc-vers CFLAGS += $(cflags-y) @@ -363,7 +363,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/Makefile tmp-linux-2.6-xen.patch/arch +CLEAN_FILES += vmlinuz vmlinux-stripped diff -Nurp pristine-linux-2.6.18/arch/i386/boot-xen/Makefile tmp-linux-2.6-xen.patch/arch/i386/boot-xen/Makefile --- pristine-linux-2.6.18/arch/i386/boot-xen/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/boot-xen/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/boot-xen/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,21 @@ + +OBJCOPYFLAGS := -g --strip-unneeded @@ -388,7 +388,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/boot-xen/Makefile tmp-linux-2.6-xen.p + ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/Makefile tmp-linux-2.6-xen.patch/arch/i386/kernel/Makefile --- pristine-linux-2.6.18/arch/i386/kernel/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -44,6 +44,12 @@ EXTRA_AFLAGS := -traditional obj-$(CONFIG_SCx200) += scx200.o @@ -435,7 +435,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/Makefile tmp-linux-2.6-xen.pat +endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/acpi/Makefile tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/Makefile --- pristine-linux-2.6.18/arch/i386/kernel/acpi/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o processor.o endif @@ -446,7 +446,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/acpi/Makefile tmp-linux-2.6-xe +endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/acpi/boot-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/boot-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/acpi/boot-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/boot-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/boot-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1168 @@ +/* + * boot.c - Architecture-Specific Low-Level ACPI Boot Support @@ -1618,7 +1618,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/acpi/boot-xen.c tmp-linux-2.6- +} diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/apic-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/apic-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/apic-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/apic-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/apic-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,155 @@ +/* + * Local APIC handling, local APIC timers @@ -1777,7 +1777,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/apic-xen.c tmp-linux-2.6-xen.p +} diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/asm-offsets.c tmp-linux-2.6-xen.patch/arch/i386/kernel/asm-offsets.c --- pristine-linux-2.6.18/arch/i386/kernel/asm-offsets.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/asm-offsets.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/asm-offsets.c 2007-11-14 15:35:27.000000000 -0800 @@ -66,9 +66,14 @@ void foo(void) OFFSET(pbe_orig_address, pbe, orig_address); OFFSET(pbe_next, pbe, next); @@ -1796,7 +1796,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/asm-offsets.c tmp-linux-2.6-xe DEFINE(VDSO_PRELINK, VDSO_PRELINK); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/Makefile tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/Makefile --- pristine-linux-2.6.18/arch/i386/kernel/cpu/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/ @@ -1808,7 +1808,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/Makefile tmp-linux-2.6-xen +endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/common-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/common-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/cpu/common-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/common-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/common-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,743 @@ +#include <linux/init.h> +#include <linux/string.h> @@ -2555,7 +2555,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/common-xen.c tmp-linux-2.6 +#endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/mtrr/Makefile tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/Makefile --- pristine-linux-2.6.18/arch/i386/kernel/cpu/mtrr/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -3,3 +3,10 @@ obj-y += amd.o obj-y += cyrix.o obj-y += centaur.o @@ -2569,7 +2569,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/mtrr/Makefile tmp-linux-2. +endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/mtrr/main-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/main-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/cpu/mtrr/main-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/main-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/main-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,197 @@ +#include <linux/init.h> +#include <linux/proc_fs.h> @@ -2770,7 +2770,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/cpu/mtrr/main-xen.c tmp-linux- +subsys_initcall(mtrr_init); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/crash.c tmp-linux-2.6-xen.patch/arch/i386/kernel/crash.c --- pristine-linux-2.6.18/arch/i386/kernel/crash.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/crash.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/crash.c 2007-11-14 15:35:27.000000000 -0800 @@ -90,6 +90,7 @@ static void crash_save_self(struct pt_re crash_save_this_cpu(regs, cpu); } @@ -2802,13 +2802,13 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/crash.c tmp-linux-2.6-xen.patc } diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/early_printk-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/early_printk-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/early_printk-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/early_printk-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/early_printk-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +#include "../../x86_64/kernel/early_printk-xen.c" diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/entry-xen.S tmp-linux-2.6-xen.patch/arch/i386/kernel/entry-xen.S --- pristine-linux-2.6.18/arch/i386/kernel/entry-xen.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/entry-xen.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/entry-xen.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1216 @@ +/* + * linux/arch/i386/entry.S @@ -4028,7 +4028,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/entry-xen.S tmp-linux-2.6-xen. +syscall_table_size=(.-sys_call_table) diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/entry.S tmp-linux-2.6-xen.patch/arch/i386/kernel/entry.S --- pristine-linux-2.6.18/arch/i386/kernel/entry.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/entry.S 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/entry.S 2007-11-16 16:18:13.000000000 -0800 @@ -269,7 +269,7 @@ ENTRY(sysenter_entry) CFI_STARTPROC simple CFI_DEF_CFA esp, 0 @@ -4058,7 +4058,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/entry.S tmp-linux-2.6-xen.patc pushl $sysenter_past_esp diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/fixup.c tmp-linux-2.6-xen.patch/arch/i386/kernel/fixup.c --- pristine-linux-2.6.18/arch/i386/kernel/fixup.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/fixup.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/fixup.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,88 @@ +/****************************************************************************** + * fixup.c @@ -4150,7 +4150,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/fixup.c tmp-linux-2.6-xen.patc +__initcall(fixup_init); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/head-xen.S tmp-linux-2.6-xen.patch/arch/i386/kernel/head-xen.S --- pristine-linux-2.6.18/arch/i386/kernel/head-xen.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/head-xen.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/head-xen.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,207 @@ + + @@ -4361,7 +4361,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/head-xen.S tmp-linux-2.6-xen.p + ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1) diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/init_task-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/init_task-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/init_task-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/init_task-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/init_task-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,51 @@ +#include <linux/mm.h> +#include <linux/module.h> @@ -4416,7 +4416,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/init_task-xen.c tmp-linux-2.6- + diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/io_apic-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/io_apic-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/io_apic-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/io_apic-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/io_apic-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2777 @@ +/* + * Intel IO-APIC support for multi-Pentium hosts. @@ -7197,7 +7197,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/io_apic-xen.c tmp-linux-2.6-xe +#endif /* CONFIG_ACPI */ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/ioport-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/ioport-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/ioport-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/ioport-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/ioport-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,122 @@ +/* + * linux/arch/i386/kernel/ioport.c @@ -7323,7 +7323,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/ioport-xen.c tmp-linux-2.6-xen +} diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/irq-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/irq-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/irq-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/irq-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/irq-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,324 @@ +/* + * linux/arch/i386/kernel/irq.c @@ -7651,7 +7651,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/irq-xen.c tmp-linux-2.6-xen.pa + diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/ldt-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/ldt-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/ldt-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/ldt-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/ldt-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,270 @@ +/* + * linux/kernel/ldt.c @@ -7925,7 +7925,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/ldt-xen.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/machine_kexec.c tmp-linux-2.6-xen.patch/arch/i386/kernel/machine_kexec.c --- pristine-linux-2.6.18/arch/i386/kernel/machine_kexec.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/machine_kexec.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/machine_kexec.c 2007-11-14 15:35:27.000000000 -0800 @@ -19,123 +19,52 @@ #include <asm/desc.h> #include <asm/system.h> @@ -8158,7 +8158,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/machine_kexec.c tmp-linux-2.6- +#endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/microcode-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/microcode-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/microcode-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/microcode-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/microcode-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,144 @@ +/* + * Intel CPU Microcode Update Driver for Linux @@ -8306,7 +8306,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/microcode-xen.c tmp-linux-2.6- +MODULE_ALIAS_MISCDEV(MICROCODE_MINOR); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/mpparse-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/mpparse-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/mpparse-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/mpparse-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/mpparse-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1185 @@ +/* + * Intel Multiprocessor Specification 1.1 and 1.4 @@ -9495,7 +9495,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/mpparse-xen.c tmp-linux-2.6-xe +#endif /* CONFIG_ACPI */ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/pci-dma-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/pci-dma-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/pci-dma-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/pci-dma-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/pci-dma-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,369 @@ +/* + * Dynamic DMA mapping support. @@ -9868,7 +9868,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/pci-dma-xen.c tmp-linux-2.6-xe +EXPORT_SYMBOL(dma_sync_single_for_device); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/process-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/process-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/process-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/process-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/process-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,853 @@ +/* + * linux/arch/i386/kernel/process.c @@ -10725,7 +10725,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/process-xen.c tmp-linux-2.6-xe +} diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/quirks-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/quirks-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/quirks-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/quirks-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/quirks-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,47 @@ +/* + * This file contains work-arounds for x86 and x86_64 platform bugs. @@ -10776,7 +10776,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/quirks-xen.c tmp-linux-2.6-xen +#endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/relocate_kernel.S tmp-linux-2.6-xen.patch/arch/i386/kernel/relocate_kernel.S --- pristine-linux-2.6.18/arch/i386/kernel/relocate_kernel.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/relocate_kernel.S 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/relocate_kernel.S 2007-11-16 16:18:11.000000000 -0800 @@ -7,16 +7,138 @@ */ @@ -11011,7 +11011,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/relocate_kernel.S tmp-linux-2. + .long 0 /* base */ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/setup-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/setup-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/setup-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/setup-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/setup-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1898 @@ +/* + * linux/arch/i386/kernel/setup.c @@ -12913,7 +12913,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/setup-xen.c tmp-linux-2.6-xen. + */ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/smp-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/smp-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/smp-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/smp-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/smp-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,624 @@ +/* + * Intel SMP support routines. @@ -13541,7 +13541,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/smp-xen.c tmp-linux-2.6-xen.pa + diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/swiotlb.c tmp-linux-2.6-xen.patch/arch/i386/kernel/swiotlb.c --- pristine-linux-2.6.18/arch/i386/kernel/swiotlb.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/swiotlb.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/swiotlb.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,734 @@ +/* + * Dynamic DMA mapping support. @@ -14279,7 +14279,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/swiotlb.c tmp-linux-2.6-xen.pa +EXPORT_SYMBOL(swiotlb_dma_supported); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/sysenter.c tmp-linux-2.6-xen.patch/arch/i386/kernel/sysenter.c --- pristine-linux-2.6.18/arch/i386/kernel/sysenter.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/sysenter.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/sysenter.c 2007-11-14 15:35:27.000000000 -0800 @@ -23,6 +23,10 @@ #include <asm/pgtable.h> #include <asm/unistd.h> @@ -14328,7 +14328,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/sysenter.c tmp-linux-2.6-xen.p printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO)); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/time-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/time-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/time-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/time-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/time-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1159 @@ +/* + * linux/arch/i386/kernel/time.c @@ -15491,7 +15491,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/time-xen.c tmp-linux-2.6-xen.p +__initcall(xen_sysctl_init); diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/traps-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/traps-xen.c --- pristine-linux-2.6.18/arch/i386/kernel/traps-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/traps-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/traps-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1186 @@ +/* + * linux/arch/i386/traps.c @@ -16681,7 +16681,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/traps-xen.c tmp-linux-2.6-xen. +#endif diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/traps.c tmp-linux-2.6-xen.patch/arch/i386/kernel/traps.c --- pristine-linux-2.6.18/arch/i386/kernel/traps.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/traps.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/traps.c 2007-11-16 16:18:12.000000000 -0800 @@ -642,18 +642,11 @@ static void mem_parity_error(unsigned ch static void io_check_error(unsigned char reason, struct pt_regs * regs) @@ -16704,7 +16704,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/traps.c tmp-linux-2.6-xen.patc static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs) diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/vm86.c tmp-linux-2.6-xen.patch/arch/i386/kernel/vm86.c --- pristine-linux-2.6.18/arch/i386/kernel/vm86.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/vm86.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/vm86.c 2007-11-14 15:35:27.000000000 -0800 @@ -97,7 +97,9 @@ struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs)); struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs) @@ -16761,7 +16761,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/vm86.c tmp-linux-2.6-xen.patch if (info->flags & VM86_SCREEN_BITMAP) diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/vmlinux.lds.S tmp-linux-2.6-xen.patch/arch/i386/kernel/vmlinux.lds.S --- pristine-linux-2.6.18/arch/i386/kernel/vmlinux.lds.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/vmlinux.lds.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/vmlinux.lds.S 2007-11-14 15:35:27.000000000 -0800 @@ -13,6 +13,12 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386" OUTPUT_ARCH(i386) ENTRY(phys_startup_32) @@ -16806,7 +16806,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/vmlinux.lds.S tmp-linux-2.6-xe } diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/vsyscall-note-xen.S tmp-linux-2.6-xen.patch/arch/i386/kernel/vsyscall-note-xen.S --- pristine-linux-2.6.18/arch/i386/kernel/vsyscall-note-xen.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/vsyscall-note-xen.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/kernel/vsyscall-note-xen.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,32 @@ +/* + * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text. @@ -16842,7 +16842,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/kernel/vsyscall-note-xen.S tmp-linux- +NOTE_KERNELCAP_END diff -Nurp pristine-linux-2.6.18/arch/i386/mach-xen/Makefile tmp-linux-2.6-xen.patch/arch/i386/mach-xen/Makefile --- pristine-linux-2.6.18/arch/i386/mach-xen/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mach-xen/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mach-xen/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,5 @@ +# +# Makefile for the linux kernel. @@ -16851,7 +16851,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mach-xen/Makefile tmp-linux-2.6-xen.p +obj-y := setup.o diff -Nurp pristine-linux-2.6.18/arch/i386/mach-xen/setup.c tmp-linux-2.6-xen.patch/arch/i386/mach-xen/setup.c --- pristine-linux-2.6.18/arch/i386/mach-xen/setup.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mach-xen/setup.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mach-xen/setup.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,147 @@ +/* + * Machine specific setup for generic @@ -17002,7 +17002,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mach-xen/setup.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/arch/i386/mm/Makefile tmp-linux-2.6-xen.patch/arch/i386/mm/Makefile --- pristine-linux-2.6.18/arch/i386/mm/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -8,3 +8,11 @@ obj-$(CONFIG_NUMA) += discontig.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_HIGHMEM) += highmem.o @@ -17017,7 +17017,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/Makefile tmp-linux-2.6-xen.patch/a +endif diff -Nurp pristine-linux-2.6.18/arch/i386/mm/fault-xen.c tmp-linux-2.6-xen.patch/arch/i386/mm/fault-xen.c --- pristine-linux-2.6.18/arch/i386/mm/fault-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/fault-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/fault-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,782 @@ +/* + * linux/arch/i386/mm/fault.c @@ -17803,7 +17803,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/fault-xen.c tmp-linux-2.6-xen.patc +#endif diff -Nurp pristine-linux-2.6.18/arch/i386/mm/highmem-xen.c tmp-linux-2.6-xen.patch/arch/i386/mm/highmem-xen.c --- pristine-linux-2.6.18/arch/i386/mm/highmem-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/highmem-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/highmem-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,136 @@ +#include <linux/highmem.h> +#include <linux/module.h> @@ -17943,7 +17943,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/highmem-xen.c tmp-linux-2.6-xen.pa +EXPORT_SYMBOL(kmap_atomic_to_page); diff -Nurp pristine-linux-2.6.18/arch/i386/mm/hypervisor.c tmp-linux-2.6-xen.patch/arch/i386/mm/hypervisor.c --- pristine-linux-2.6.18/arch/i386/mm/hypervisor.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/hypervisor.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/hypervisor.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,543 @@ +/****************************************************************************** + * mm/hypervisor.c @@ -18490,7 +18490,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/hypervisor.c tmp-linux-2.6-xen.pat +#endif diff -Nurp pristine-linux-2.6.18/arch/i386/mm/init-xen.c tmp-linux-2.6-xen.patch/arch/i386/mm/init-xen.c --- pristine-linux-2.6.18/arch/i386/mm/init-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/init-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/init-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,850 @@ +/* + * linux/arch/i386/mm/init.c @@ -19344,7 +19344,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/init-xen.c tmp-linux-2.6-xen.patch + diff -Nurp pristine-linux-2.6.18/arch/i386/mm/ioremap-xen.c tmp-linux-2.6-xen.patch/arch/i386/mm/ioremap-xen.c --- pristine-linux-2.6.18/arch/i386/mm/ioremap-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/ioremap-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/ioremap-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,443 @@ +/* + * arch/i386/mm/ioremap.c @@ -19791,7 +19791,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/ioremap-xen.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/arch/i386/mm/pageattr.c tmp-linux-2.6-xen.patch/arch/i386/mm/pageattr.c --- pristine-linux-2.6.18/arch/i386/mm/pageattr.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/pageattr.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/pageattr.c 2007-11-16 16:18:12.000000000 -0800 @@ -84,7 +84,7 @@ static void set_pmd_pte(pte_t *kpte, uns unsigned long flags; @@ -19803,7 +19803,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/pageattr.c tmp-linux-2.6-xen.patch spin_lock_irqsave(&pgd_lock, flags); diff -Nurp pristine-linux-2.6.18/arch/i386/mm/pgtable-xen.c tmp-linux-2.6-xen.patch/arch/i386/mm/pgtable-xen.c --- pristine-linux-2.6.18/arch/i386/mm/pgtable-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/pgtable-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/pgtable-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,727 @@ +/* + * linux/arch/i386/mm/pgtable.c @@ -20534,7 +20534,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/pgtable-xen.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/arch/i386/mm/pgtable.c tmp-linux-2.6-xen.patch/arch/i386/mm/pgtable.c --- pristine-linux-2.6.18/arch/i386/mm/pgtable.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/mm/pgtable.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/mm/pgtable.c 2007-11-16 16:18:13.000000000 -0800 @@ -12,6 +12,7 @@ #include <linux/slab.h> #include <linux/pagemap.h> @@ -20642,7 +20642,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/mm/pgtable.c tmp-linux-2.6-xen.patch/ } diff -Nurp pristine-linux-2.6.18/arch/i386/oprofile/Makefile tmp-linux-2.6-xen.patch/arch/i386/oprofile/Makefile --- pristine-linux-2.6.18/arch/i386/oprofile/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/oprofile/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/oprofile/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -6,7 +6,14 @@ DRIVER_OBJS = $(addprefix ../../../drive oprofilefs.o oprofile_stats.o \ timer_int.o ) @@ -20660,7 +20660,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/oprofile/Makefile tmp-linux-2.6-xen.p +endif diff -Nurp pristine-linux-2.6.18/arch/i386/oprofile/xenoprof.c tmp-linux-2.6-xen.patch/arch/i386/oprofile/xenoprof.c --- pristine-linux-2.6.18/arch/i386/oprofile/xenoprof.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/oprofile/xenoprof.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/oprofile/xenoprof.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,179 @@ +/** + * @file xenoprof.c @@ -20843,7 +20843,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/oprofile/xenoprof.c tmp-linux-2.6-xen +} diff -Nurp pristine-linux-2.6.18/arch/i386/pci/Makefile tmp-linux-2.6-xen.patch/arch/i386/pci/Makefile --- pristine-linux-2.6.18/arch/i386/pci/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/pci/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/pci/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -4,6 +4,10 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o obj-$(CONFIG_PCI_DIRECT) += direct.o @@ -20866,7 +20866,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/pci/Makefile tmp-linux-2.6-xen.patch/ +endif diff -Nurp pristine-linux-2.6.18/arch/i386/pci/irq-xen.c tmp-linux-2.6-xen.patch/arch/i386/pci/irq-xen.c --- pristine-linux-2.6.18/arch/i386/pci/irq-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/pci/irq-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/pci/irq-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1205 @@ +/* + * Low-Level PCI Support for PC -- Routing of Interrupts @@ -22075,7 +22075,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/pci/irq-xen.c tmp-linux-2.6-xen.patch +} diff -Nurp pristine-linux-2.6.18/arch/i386/pci/pcifront.c tmp-linux-2.6-xen.patch/arch/i386/pci/pcifront.c --- pristine-linux-2.6.18/arch/i386/pci/pcifront.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/i386/pci/pcifront.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/pci/pcifront.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,55 @@ +/* + * PCI Frontend Stub - puts some "dummy" functions in to the Linux x86 PCI core @@ -22134,7 +22134,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/pci/pcifront.c tmp-linux-2.6-xen.patc +arch_initcall(pcifront_x86_stub_init); diff -Nurp pristine-linux-2.6.18/arch/i386/power/Makefile tmp-linux-2.6-xen.patch/arch/i386/power/Makefile --- pristine-linux-2.6.18/arch/i386/power/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/i386/power/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/i386/power/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -1,2 +1,4 @@ -obj-$(CONFIG_PM) += cpu.o +obj-$(CONFIG_PM_LEGACY) += cpu.o @@ -22143,7 +22143,7 @@ diff -Nurp pristine-linux-2.6.18/arch/i386/power/Makefile tmp-linux-2.6-xen.patc obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o diff -Nurp pristine-linux-2.6.18/arch/ia64/Kconfig tmp-linux-2.6-xen.patch/arch/ia64/Kconfig --- pristine-linux-2.6.18/arch/ia64/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -58,6 +58,34 @@ config GENERIC_IOMAP bool default y @@ -22217,7 +22217,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/Kconfig tmp-linux-2.6-xen.patch/arch/ +source "drivers/xen/Kconfig" diff -Nurp pristine-linux-2.6.18/arch/ia64/Makefile tmp-linux-2.6-xen.patch/arch/ia64/Makefile --- pristine-linux-2.6.18/arch/ia64/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -45,6 +45,12 @@ ifeq ($(call cc-version),0304) endif @@ -22260,7 +22260,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/Makefile tmp-linux-2.6-xen.patch/arch echo '* compressed - Build compressed kernel image' diff -Nurp pristine-linux-2.6.18/arch/ia64/dig/setup.c tmp-linux-2.6-xen.patch/arch/ia64/dig/setup.c --- pristine-linux-2.6.18/arch/ia64/dig/setup.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/dig/setup.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/dig/setup.c 2007-11-14 15:35:27.000000000 -0800 @@ -24,6 +24,8 @@ #include <asm/machvec.h> #include <asm/system.h> @@ -22292,7 +22292,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/dig/setup.c tmp-linux-2.6-xen.patch/a } diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/asm-offsets.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/asm-offsets.c --- pristine-linux-2.6.18/arch/ia64/kernel/asm-offsets.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/asm-offsets.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/asm-offsets.c 2007-11-14 15:35:27.000000000 -0800 @@ -268,4 +268,29 @@ void foo(void) DEFINE(IA64_TIME_SOURCE_MMIO64, TIME_SOURCE_MMIO64); DEFINE(IA64_TIME_SOURCE_MMIO32, TIME_SOURCE_MMIO32); @@ -22325,7 +22325,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/asm-offsets.c tmp-linux-2.6-xe } diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/entry.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/entry.S --- pristine-linux-2.6.18/arch/ia64/kernel/entry.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/entry.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/entry.S 2007-11-14 15:35:27.000000000 -0800 @@ -180,7 +180,7 @@ END(sys_clone) * called. The code starting at .map relies on this. The rest of the code * doesn't care about the interrupt masking status. @@ -22465,7 +22465,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/entry.S tmp-linux-2.6-xen.patc br.many b7 diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/fsys.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/fsys.S --- pristine-linux-2.6.18/arch/ia64/kernel/fsys.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/fsys.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/fsys.S 2007-11-14 15:35:27.000000000 -0800 @@ -516,11 +516,34 @@ ENTRY(fsys_fallback_syscall) adds r17=-1024,r15 movl r14=sys_call_table @@ -22529,7 +22529,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/fsys.S tmp-linux-2.6-xen.patch diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/gate.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/gate.S --- pristine-linux-2.6.18/arch/ia64/kernel/gate.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/gate.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/gate.S 2007-11-14 15:35:27.000000000 -0800 @@ -13,6 +13,9 @@ #include <asm/sigcontext.h> #include <asm/system.h> @@ -22685,7 +22685,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/gate.S tmp-linux-2.6-xen.patch END(__kernel_syscall_via_epc) diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/gate.lds.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/gate.lds.S --- pristine-linux-2.6.18/arch/ia64/kernel/gate.lds.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/gate.lds.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/gate.lds.S 2007-11-14 15:35:27.000000000 -0800 @@ -43,6 +43,20 @@ SECTIONS __start_gate_brl_fsys_bubble_down_patchlist = .; *(.data.patch.brl_fsys_bubble_down) @@ -22709,7 +22709,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/gate.lds.S tmp-linux-2.6-xen.p .IA_64.unwind : { *(.IA_64.unwind*) } :readable :unwind diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/head.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/head.S --- pristine-linux-2.6.18/arch/ia64/kernel/head.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/head.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/head.S 2007-11-14 15:35:27.000000000 -0800 @@ -367,6 +367,12 @@ start_ap: ;; (isBP) st8 [r2]=r28 // save the address of the boot param area passed by the bootloader @@ -22725,7 +22725,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/head.S tmp-linux-2.6-xen.patch .ret0: diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/iosapic.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/iosapic.c --- pristine-linux-2.6.18/arch/ia64/kernel/iosapic.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/iosapic.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/iosapic.c 2007-11-14 15:35:27.000000000 -0800 @@ -159,6 +159,75 @@ static unsigned char pcat_compat __devin static int iosapic_kmalloc_ok; static LIST_HEAD(free_rte_list); @@ -22824,7 +22824,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/iosapic.c tmp-linux-2.6-xen.pa * Disable the compatibility mode interrupts (8259 style), diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/irq_ia64.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/irq_ia64.c --- pristine-linux-2.6.18/arch/ia64/kernel/irq_ia64.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/irq_ia64.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/irq_ia64.c 2007-11-14 15:35:27.000000000 -0800 @@ -30,6 +30,9 @@ #include <linux/smp_lock.h> #include <linux/threads.h> @@ -23220,7 +23220,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/irq_ia64.c tmp-linux-2.6-xen.p #else diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/pal.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/pal.S --- pristine-linux-2.6.18/arch/ia64/kernel/pal.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/pal.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/pal.S 2007-11-14 15:35:27.000000000 -0800 @@ -16,6 +16,7 @@ #include <asm/processor.h> @@ -23249,7 +23249,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/pal.S tmp-linux-2.6-xen.patch/ * Make a PAL call using the stacked registers calling convention. diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/patch.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/patch.c --- pristine-linux-2.6.18/arch/ia64/kernel/patch.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/patch.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/patch.c 2007-11-14 15:35:27.000000000 -0800 @@ -184,6 +184,69 @@ patch_brl_fsys_bubble_down (unsigned lon ia64_srlz_i(); } @@ -23333,7 +23333,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/patch.c tmp-linux-2.6-xen.patc } diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/perfmon.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/perfmon.c --- pristine-linux-2.6.18/arch/ia64/kernel/perfmon.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/perfmon.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/perfmon.c 2007-11-14 15:35:27.000000000 -0800 @@ -52,6 +52,28 @@ #include <asm/delay.h> @@ -23530,7 +23530,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/perfmon.c tmp-linux-2.6-xen.pa prev_state = ctx->ctx_state; diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/setup.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/setup.c --- pristine-linux-2.6.18/arch/ia64/kernel/setup.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/setup.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/setup.c 2007-11-14 15:35:27.000000000 -0800 @@ -60,6 +60,12 @@ #include <asm/system.h> #include <asm/unistd.h> @@ -23712,7 +23712,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/setup.c tmp-linux-2.6-xen.patc diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/smp.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/smp.c --- pristine-linux-2.6.18/arch/ia64/kernel/smp.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/smp.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/smp.c 2007-11-16 16:18:13.000000000 -0800 @@ -328,10 +328,14 @@ int smp_call_function (void (*func) (void *info), void *info, int nonatomic, int wait) { @@ -23741,7 +23741,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/smp.c tmp-linux-2.6-xen.patch/ send_IPI_allbutself(IPI_CALL_FUNC); diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/time.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/time.c --- pristine-linux-2.6.18/arch/ia64/kernel/time.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/time.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/time.c 2007-11-14 15:35:27.000000000 -0800 @@ -29,6 +29,13 @@ #include <asm/sections.h> #include <asm/system.h> @@ -23990,7 +23990,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/kernel/time.c tmp-linux-2.6-xen.patch } diff -Nurp pristine-linux-2.6.18/arch/ia64/mm/ioremap.c tmp-linux-2.6-xen.patch/arch/ia64/mm/ioremap.c --- pristine-linux-2.6.18/arch/ia64/mm/ioremap.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/mm/ioremap.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/mm/ioremap.c 2007-11-14 15:35:27.000000000 -0800 @@ -16,6 +16,9 @@ static inline void __iomem * __ioremap (unsigned long offset, unsigned long size) @@ -24003,7 +24003,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/mm/ioremap.c tmp-linux-2.6-xen.patch/ diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/Makefile tmp-linux-2.6-xen.patch/arch/ia64/oprofile/Makefile --- pristine-linux-2.6.18/arch/ia64/oprofile/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -8,3 +8,7 @@ DRIVER_OBJS := $(addprefix ../../../driv oprofile-y := $(DRIVER_OBJS) init.o backtrace.o @@ -24014,7 +24014,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/Makefile tmp-linux-2.6-xen.p +endif diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/init.c tmp-linux-2.6-xen.patch/arch/ia64/oprofile/init.c --- pristine-linux-2.6.18/arch/ia64/oprofile/init.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/init.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/init.c 2007-11-14 15:35:27.000000000 -0800 @@ -11,6 +11,7 @@ #include <linux/oprofile.h> #include <linux/init.h> @@ -24052,7 +24052,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/init.c tmp-linux-2.6-xen.pat #endif diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/oprofile_perfmon.h tmp-linux-2.6-xen.patch/arch/ia64/oprofile/oprofile_perfmon.h --- pristine-linux-2.6.18/arch/ia64/oprofile/oprofile_perfmon.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/oprofile_perfmon.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/oprofile_perfmon.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,28 @@ +#ifndef OPROFILE_PERFMON_H +#define OPROFILE_PERFMON_H @@ -24084,7 +24084,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/oprofile_perfmon.h tmp-linux +#endif /* OPROFILE_PERFMON_H */ diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/perfmon.c tmp-linux-2.6-xen.patch/arch/ia64/oprofile/perfmon.c --- pristine-linux-2.6.18/arch/ia64/oprofile/perfmon.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/perfmon.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/perfmon.c 2007-11-14 15:35:27.000000000 -0800 @@ -13,6 +13,7 @@ #include <asm/perfmon.h> #include <asm/ptrace.h> @@ -24162,7 +24162,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/perfmon.c tmp-linux-2.6-xen. } diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/xenoprof.c tmp-linux-2.6-xen.patch/arch/ia64/oprofile/xenoprof.c --- pristine-linux-2.6.18/arch/ia64/oprofile/xenoprof.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/xenoprof.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/oprofile/xenoprof.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,142 @@ +/****************************************************************************** + * xenoprof ia64 specific part @@ -24308,7 +24308,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/oprofile/xenoprof.c tmp-linux-2.6-xen +} diff -Nurp pristine-linux-2.6.18/arch/ia64/pci/pci.c tmp-linux-2.6-xen.patch/arch/ia64/pci/pci.c --- pristine-linux-2.6.18/arch/ia64/pci/pci.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/ia64/pci/pci.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/pci/pci.c 2007-11-14 15:35:27.000000000 -0800 @@ -165,6 +165,11 @@ new_space (u64 phys_base, int sparse) io_space[i].mmio_base = mmio_base; io_space[i].sparse = sparse; @@ -24385,7 +24385,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/pci/pci.c tmp-linux-2.6-xen.patch/arc +#endif diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/Makefile tmp-linux-2.6-xen.patch/arch/ia64/xen/Makefile --- pristine-linux-2.6.18/arch/ia64/xen/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,9 @@ +# +# Makefile for Xen components @@ -24398,7 +24398,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/Makefile tmp-linux-2.6-xen.patch/ +pci-dma-xen-y := ../../i386/kernel/pci-dma-xen.o diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/hypercall.S tmp-linux-2.6-xen.patch/arch/ia64/xen/hypercall.S --- pristine-linux-2.6.18/arch/ia64/xen/hypercall.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/hypercall.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/hypercall.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,170 @@ +/* + * Support routines for Xen hypercalls @@ -24572,7 +24572,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/hypercall.S tmp-linux-2.6-xen.pat +#endif diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/hypervisor.c tmp-linux-2.6-xen.patch/arch/ia64/xen/hypervisor.c --- pristine-linux-2.6.18/arch/ia64/xen/hypervisor.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/hypervisor.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/hypervisor.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1234 @@ +/****************************************************************************** + * include/asm-ia64/shadow.h @@ -25810,7 +25810,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/hypervisor.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/mem.c tmp-linux-2.6-xen.patch/arch/ia64/xen/mem.c --- pristine-linux-2.6.18/arch/ia64/xen/mem.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/mem.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/mem.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,75 @@ +/* + * Originally from linux/drivers/char/mem.c @@ -25889,7 +25889,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/mem.c tmp-linux-2.6-xen.patch/arc +} diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/util.c tmp-linux-2.6-xen.patch/arch/ia64/xen/util.c --- pristine-linux-2.6.18/arch/ia64/xen/util.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/util.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/util.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,105 @@ +/****************************************************************************** + * arch/ia64/xen/util.c @@ -25998,7 +25998,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/util.c tmp-linux-2.6-xen.patch/ar + */ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xcom_hcall.c tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_hcall.c --- pristine-linux-2.6.18/arch/ia64/xen/xcom_hcall.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_hcall.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_hcall.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,383 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -26385,7 +26385,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xcom_hcall.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xcom_mini.c tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_mini.c --- pristine-linux-2.6.18/arch/ia64/xen/xcom_mini.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_mini.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_mini.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,456 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -26845,7 +26845,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xcom_mini.c tmp-linux-2.6-xen.pat +EXPORT_SYMBOL_GPL(xencomm_mini_hypercall_sched_op); diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xcom_privcmd.c tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_privcmd.c --- pristine-linux-2.6.18/arch/ia64/xen/xcom_privcmd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_privcmd.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xcom_privcmd.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,663 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -27512,7 +27512,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xcom_privcmd.c tmp-linux-2.6-xen. + diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xencomm.c tmp-linux-2.6-xen.patch/arch/ia64/xen/xencomm.c --- pristine-linux-2.6.18/arch/ia64/xen/xencomm.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xencomm.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xencomm.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,263 @@ +/* + * Copyright (C) 2006 Hollis Blanchard <hollisb@us.ibm.com>, IBM Corporation @@ -27779,7 +27779,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xencomm.c tmp-linux-2.6-xen.patch +} diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenentry.S tmp-linux-2.6-xen.patch/arch/ia64/xen/xenentry.S --- pristine-linux-2.6.18/arch/ia64/xen/xenentry.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenentry.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenentry.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,931 @@ +/* + * ia64/xen/entry.S @@ -28714,7 +28714,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenentry.S tmp-linux-2.6-xen.patc +#endif diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenhpski.c tmp-linux-2.6-xen.patch/arch/ia64/xen/xenhpski.c --- pristine-linux-2.6.18/arch/ia64/xen/xenhpski.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenhpski.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenhpski.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,19 @@ + +extern unsigned long xen_get_cpuid(int); @@ -28737,7 +28737,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenhpski.c tmp-linux-2.6-xen.patc + diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenivt.S tmp-linux-2.6-xen.patch/arch/ia64/xen/xenivt.S --- pristine-linux-2.6.18/arch/ia64/xen/xenivt.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenivt.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenivt.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2177 @@ +/* + * arch/ia64/xen/ivt.S @@ -30918,7 +30918,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenivt.S tmp-linux-2.6-xen.patch/ +#endif diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenminstate.h tmp-linux-2.6-xen.patch/arch/ia64/xen/xenminstate.h --- pristine-linux-2.6.18/arch/ia64/xen/xenminstate.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenminstate.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenminstate.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,358 @@ +#include <asm/cache.h> + @@ -31280,7 +31280,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenminstate.h tmp-linux-2.6-xen.p +#endif diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenpal.S tmp-linux-2.6-xen.patch/arch/ia64/xen/xenpal.S --- pristine-linux-2.6.18/arch/ia64/xen/xenpal.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenpal.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xenpal.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,85 @@ +/* + * ia64/xen/xenpal.S @@ -31369,7 +31369,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xenpal.S tmp-linux-2.6-xen.patch/ +END(xen_pal_call_static) diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xensetup.S tmp-linux-2.6-xen.patch/arch/ia64/xen/xensetup.S --- pristine-linux-2.6.18/arch/ia64/xen/xensetup.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xensetup.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/xensetup.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,52 @@ +/* + * Support routines for Xen @@ -31425,7 +31425,7 @@ diff -Nurp pristine-linux-2.6.18/arch/ia64/xen/xensetup.S tmp-linux-2.6-xen.patc +END(xencomm_arch_hypercall_suspend) diff -Nurp pristine-linux-2.6.18/arch/um/kernel/physmem.c tmp-linux-2.6-xen.patch/arch/um/kernel/physmem.c --- pristine-linux-2.6.18/arch/um/kernel/physmem.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/um/kernel/physmem.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/um/kernel/physmem.c 2007-11-14 15:35:27.000000000 -0800 @@ -226,7 +226,7 @@ EXPORT_SYMBOL(physmem_forget_descriptor) EXPORT_SYMBOL(physmem_remove_mapping); EXPORT_SYMBOL(physmem_subst_mapping); @@ -31446,7 +31446,7 @@ diff -Nurp pristine-linux-2.6.18/arch/um/kernel/physmem.c tmp-linux-2.6-xen.patc int is_remapped(void *virt) diff -Nurp pristine-linux-2.6.18/arch/x86_64/Kconfig tmp-linux-2.6-xen.patch/arch/x86_64/Kconfig --- pristine-linux-2.6.18/arch/x86_64/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -135,6 +135,22 @@ config GENERIC_CPU endchoice @@ -31640,7 +31640,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/Kconfig tmp-linux-2.6-xen.patch/arc source "lib/Kconfig" diff -Nurp pristine-linux-2.6.18/arch/x86_64/Makefile tmp-linux-2.6-xen.patch/arch/x86_64/Makefile --- pristine-linux-2.6.18/arch/x86_64/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -32,6 +32,10 @@ cflags-$(CONFIG_MK8) += $(call cc-option cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona) cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic) @@ -31684,7 +31684,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/Makefile tmp-linux-2.6-xen.patch/ar $(Q)$(MAKE) $(clean)=$(boot) diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/Makefile tmp-linux-2.6-xen.patch/arch/x86_64/ia32/Makefile --- pristine-linux-2.6.18/arch/x86_64/ia32/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -27,9 +27,25 @@ quiet_cmd_syscall = SYSCALL $@ -Wl,-soname=linux-gate.so.1 -o $@ \ -Wl,-T,$(filter-out FORCE,$^) @@ -31715,7 +31715,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/Makefile tmp-linux-2.6-xen.pat +endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/ia32entry-xen.S tmp-linux-2.6-xen.patch/arch/x86_64/ia32/ia32entry-xen.S --- pristine-linux-2.6.18/arch/x86_64/ia32/ia32entry-xen.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/ia32entry-xen.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/ia32entry-xen.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,755 @@ +/* + * Compatibility mode system call entry point for x86-64. @@ -32474,7 +32474,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/ia32entry-xen.S tmp-linux-2.6- +ia32_syscall_end: diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/syscall32-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/ia32/syscall32-xen.c --- pristine-linux-2.6.18/arch/x86_64/ia32/syscall32-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/syscall32-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/syscall32-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,128 @@ +/* Copyright 2002,2003 Andi Kleen, SuSE Labs */ + @@ -32606,7 +32606,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/syscall32-xen.c tmp-linux-2.6- +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/syscall32_syscall-xen.S tmp-linux-2.6-xen.patch/arch/x86_64/ia32/syscall32_syscall-xen.S --- pristine-linux-2.6.18/arch/x86_64/ia32/syscall32_syscall-xen.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/syscall32_syscall-xen.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/syscall32_syscall-xen.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,28 @@ +/* 32bit VDSOs mapped into user space. */ + @@ -32638,7 +32638,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/syscall32_syscall-xen.S tmp-li +syscall32_sysenter_end: diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/vsyscall-int80.S tmp-linux-2.6-xen.patch/arch/x86_64/ia32/vsyscall-int80.S --- pristine-linux-2.6.18/arch/x86_64/ia32/vsyscall-int80.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/vsyscall-int80.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/vsyscall-int80.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,58 @@ +/* + * Code for the vsyscall page. This version uses the old int $0x80 method. @@ -32700,7 +32700,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/vsyscall-int80.S tmp-linux-2.6 +#include "vsyscall-sigreturn.S" diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/vsyscall-sigreturn.S tmp-linux-2.6-xen.patch/arch/x86_64/ia32/vsyscall-sigreturn.S --- pristine-linux-2.6.18/arch/x86_64/ia32/vsyscall-sigreturn.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/vsyscall-sigreturn.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/ia32/vsyscall-sigreturn.S 2007-11-14 15:35:27.000000000 -0800 @@ -139,5 +139,5 @@ __kernel_rt_sigreturn: .align 4 .LENDFDE3: @@ -32710,7 +32710,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/ia32/vsyscall-sigreturn.S tmp-linux diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/Makefile tmp-linux-2.6-xen.patch/arch/x86_64/kernel/Makefile --- pristine-linux-2.6.18/arch/x86_64/kernel/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -21,11 +21,13 @@ obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o @@ -32747,7 +32747,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/Makefile tmp-linux-2.6-xen.p +endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/acpi/Makefile tmp-linux-2.6-xen.patch/arch/x86_64/kernel/acpi/Makefile --- pristine-linux-2.6.18/arch/x86_64/kernel/acpi/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/acpi/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/acpi/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -7,3 +7,4 @@ obj-y += processor.o processor-y := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o endif @@ -32755,7 +32755,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/acpi/Makefile tmp-linux-2.6- +boot-$(CONFIG_XEN) := ../../../i386/kernel/acpi/boot-xen.o diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/apic-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/apic-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/apic-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/apic-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/apic-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,197 @@ +/* + * Local APIC handling, local APIC timers @@ -32956,7 +32956,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/apic-xen.c tmp-linux-2.6-xen +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/asm-offsets.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/asm-offsets.c --- pristine-linux-2.6.18/arch/x86_64/kernel/asm-offsets.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/asm-offsets.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/asm-offsets.c 2007-11-14 15:35:27.000000000 -0800 @@ -67,8 +67,10 @@ int main(void) DEFINE(pbe_address, offsetof(struct pbe, address)); DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address)); @@ -32970,7 +32970,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/asm-offsets.c tmp-linux-2.6- return 0; diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/crash.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/crash.c --- pristine-linux-2.6.18/arch/x86_64/kernel/crash.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/crash.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/crash.c 2007-11-14 15:35:27.000000000 -0800 @@ -92,6 +92,7 @@ static void crash_save_self(struct pt_re crash_save_this_cpu(regs, cpu); } @@ -33006,7 +33006,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/crash.c tmp-linux-2.6-xen.pa } diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/e820-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/e820-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/e820-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/e820-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/e820-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,774 @@ +/* + * Handle the memory map. @@ -33784,7 +33784,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/e820-xen.c tmp-linux-2.6-xen +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/early_printk-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/early_printk-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/early_printk-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/early_printk-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/early_printk-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,302 @@ +#include <linux/console.h> +#include <linux/kernel.h> @@ -34090,7 +34090,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/early_printk-xen.c tmp-linux +__setup("earlyprintk=", setup_early_printk); diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/entry-xen.S tmp-linux-2.6-xen.patch/arch/x86_64/kernel/entry-xen.S --- pristine-linux-2.6.18/arch/x86_64/kernel/entry-xen.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/entry-xen.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/entry-xen.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1325 @@ +/* + * linux/arch/x86_64/entry.S @@ -35419,7 +35419,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/entry-xen.S tmp-linux-2.6-xe +#endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/genapic-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/genapic-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/genapic-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/genapic-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/genapic-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,143 @@ +/* + * Copyright 2004 James Cleverdon, IBM. @@ -35566,7 +35566,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/genapic-xen.c tmp-linux-2.6- +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/genapic_xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/genapic_xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/genapic_xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/genapic_xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/genapic_xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,161 @@ +/* + * Copyright 2004 James Cleverdon, IBM. @@ -35731,7 +35731,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/genapic_xen.c tmp-linux-2.6- +}; diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/head-xen.S tmp-linux-2.6-xen.patch/arch/x86_64/kernel/head-xen.S --- pristine-linux-2.6.18/arch/x86_64/kernel/head-xen.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/head-xen.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/head-xen.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,203 @@ +/* + * linux/arch/x86_64/kernel/head.S -- start in 32bit and switch to 64bit @@ -35938,7 +35938,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/head-xen.S tmp-linux-2.6-xen + ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1) diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/head64-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/head64-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/head64-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/head64-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/head64-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,162 @@ +/* + * linux/arch/x86_64/kernel/head64.c -- prepare to run common code @@ -36104,7 +36104,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/head64-xen.c tmp-linux-2.6-x +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/init_task.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/init_task.c --- pristine-linux-2.6.18/arch/x86_64/kernel/init_task.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/init_task.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/init_task.c 2007-11-14 15:35:27.000000000 -0800 @@ -37,6 +37,8 @@ union thread_union init_thread_union struct task_struct init_task = INIT_TASK(init_task); @@ -36123,7 +36123,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/init_task.c tmp-linux-2.6-xe #define ALIGN_TO_4K __attribute__((section(".data.init_task"))) diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/io_apic-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/io_apic-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/io_apic-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/io_apic-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/io_apic-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2269 @@ +/* + * Intel IO-APIC support for multi-Pentium hosts. @@ -38396,7 +38396,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/io_apic-xen.c tmp-linux-2.6- +#endif /* !CONFIG_XEN */ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/ioport-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/ioport-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/ioport-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/ioport-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/ioport-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,99 @@ +/* + * linux/arch/x86_64/kernel/ioport.c @@ -38499,7 +38499,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/ioport-xen.c tmp-linux-2.6-x +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/irq-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/irq-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/irq-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/irq-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/irq-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,197 @@ +/* + * linux/arch/x86_64/kernel/irq.c @@ -38700,7 +38700,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/irq-xen.c tmp-linux-2.6-xen. +#endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/ldt-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/ldt-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/ldt-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/ldt-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/ldt-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,282 @@ +/* + * linux/arch/x86_64/kernel/ldt.c @@ -38986,7 +38986,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/ldt-xen.c tmp-linux-2.6-xen. +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/machine_kexec.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/machine_kexec.c --- pristine-linux-2.6.18/arch/x86_64/kernel/machine_kexec.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/machine_kexec.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/machine_kexec.c 2007-11-14 15:35:27.000000000 -0800 @@ -15,6 +15,113 @@ #include <asm/mmu_context.h> #include <asm/io.h> @@ -39307,7 +39307,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/machine_kexec.c tmp-linux-2. +#endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/mpparse-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/mpparse-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/mpparse-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/mpparse-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/mpparse-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1011 @@ +/* + * Intel Multiprocessor Specification 1.1 and 1.4 @@ -40322,7 +40322,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/mpparse-xen.c tmp-linux-2.6- +#endif /*CONFIG_ACPI*/ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/pci-swiotlb-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/pci-swiotlb-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/pci-swiotlb-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/pci-swiotlb-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/pci-swiotlb-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,55 @@ +/* Glue code to lib/swiotlb.c */ + @@ -40381,7 +40381,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/pci-swiotlb-xen.c tmp-linux- +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/process-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/process-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/process-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/process-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/process-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,829 @@ +/* + * linux/arch/x86-64/kernel/process.c @@ -41214,7 +41214,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/process-xen.c tmp-linux-2.6- +#endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/relocate_kernel.S tmp-linux-2.6-xen.patch/arch/x86_64/kernel/relocate_kernel.S --- pristine-linux-2.6.18/arch/x86_64/kernel/relocate_kernel.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/relocate_kernel.S 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/relocate_kernel.S 2007-11-16 16:18:11.000000000 -0800 @@ -7,31 +7,195 @@ */ @@ -41453,7 +41453,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/relocate_kernel.S tmp-linux- + .quad 0 /* base */ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/setup-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/setup-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/setup-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/setup-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/setup-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1677 @@ +/* + * linux/arch/x86-64/kernel/setup.c @@ -43134,7 +43134,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/setup-xen.c tmp-linux-2.6-xe +#endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/setup64-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/setup64-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/setup64-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/setup64-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/setup64-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,361 @@ +/* + * X86-64 specific CPU setup. @@ -43499,7 +43499,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/setup64-xen.c tmp-linux-2.6- +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/smp-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/smp-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/smp-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/smp-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/smp-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,600 @@ +/* + * Intel SMP support routines. @@ -44103,7 +44103,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/smp-xen.c tmp-linux-2.6-xen. +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/traps-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/traps-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/traps-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/traps-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/traps-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1175 @@ +/* + * linux/arch/x86-64/traps.c @@ -45282,7 +45282,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/traps-xen.c tmp-linux-2.6-xe +#endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/vmlinux.lds.S tmp-linux-2.6-xen.patch/arch/x86_64/kernel/vmlinux.lds.S --- pristine-linux-2.6.18/arch/x86_64/kernel/vmlinux.lds.S 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/vmlinux.lds.S 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/vmlinux.lds.S 2007-11-16 16:18:13.000000000 -0800 @@ -13,6 +13,13 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86 OUTPUT_ARCH(i386:x86-64) ENTRY(phys_startup_64) @@ -45367,7 +45367,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/vmlinux.lds.S tmp-linux-2.6- } diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/vsyscall-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/kernel/vsyscall-xen.c --- pristine-linux-2.6.18/arch/x86_64/kernel/vsyscall-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/vsyscall-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/vsyscall-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,239 @@ +/* + * linux/arch/x86_64/kernel/vsyscall.c @@ -45610,7 +45610,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/vsyscall-xen.c tmp-linux-2.6 +__initcall(vsyscall_init); diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/xen_entry.S tmp-linux-2.6-xen.patch/arch/x86_64/kernel/xen_entry.S --- pristine-linux-2.6.18/arch/x86_64/kernel/xen_entry.S 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/xen_entry.S 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/kernel/xen_entry.S 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,40 @@ +/* + * Copied from arch/xen/i386/kernel/entry.S @@ -45654,7 +45654,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/kernel/xen_entry.S tmp-linux-2.6-xe + diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/Makefile tmp-linux-2.6-xen.patch/arch/x86_64/mm/Makefile --- pristine-linux-2.6.18/arch/x86_64/mm/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -9,3 +9,13 @@ obj-$(CONFIG_K8_NUMA) += k8topology.o obj-$(CONFIG_ACPI_NUMA) += srat.o @@ -45671,7 +45671,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/Makefile tmp-linux-2.6-xen.patch +endif diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/fault-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/mm/fault-xen.c --- pristine-linux-2.6.18/arch/x86_64/mm/fault-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/fault-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/fault-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,724 @@ +/* + * linux/arch/x86-64/mm/fault.c @@ -46399,7 +46399,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/fault-xen.c tmp-linux-2.6-xen.pa +__setup("pagefaulttrace", enable_pagefaulttrace); diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/init-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/mm/init-xen.c --- pristine-linux-2.6.18/arch/x86_64/mm/init-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/init-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/init-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1238 @@ +/* + * linux/arch/x86_64/mm/init.c @@ -47641,7 +47641,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/init-xen.c tmp-linux-2.6-xen.pat +} diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/pageattr-xen.c tmp-linux-2.6-xen.patch/arch/x86_64/mm/pageattr-xen.c --- pristine-linux-2.6.18/arch/x86_64/mm/pageattr-xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/pageattr-xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/mm/pageattr-xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,433 @@ +/* + * Copyright 2002 Andi Kleen, SuSE Labs. @@ -48078,7 +48078,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/mm/pageattr-xen.c tmp-linux-2.6-xen +EXPORT_SYMBOL(global_flush_tlb); diff -Nurp pristine-linux-2.6.18/arch/x86_64/oprofile/Makefile tmp-linux-2.6-xen.patch/arch/x86_64/oprofile/Makefile --- pristine-linux-2.6.18/arch/x86_64/oprofile/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/oprofile/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/oprofile/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -11,9 +11,15 @@ DRIVER_OBJS = $(addprefix ../../../drive oprofilefs.o oprofile_stats.o \ timer_int.o ) @@ -48099,7 +48099,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/oprofile/Makefile tmp-linux-2.6-xen + $(addprefix ../../i386/oprofile/, $(OPROFILE-y)) diff -Nurp pristine-linux-2.6.18/arch/x86_64/pci/Makefile tmp-linux-2.6-xen.patch/arch/x86_64/pci/Makefile --- pristine-linux-2.6.18/arch/x86_64/pci/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/arch/x86_64/pci/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/arch/x86_64/pci/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -15,11 +15,23 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o obj-$(CONFIG_NUMA) += k8-bus.o @@ -48126,7 +48126,7 @@ diff -Nurp pristine-linux-2.6.18/arch/x86_64/pci/Makefile tmp-linux-2.6-xen.patc +endif diff -Nurp pristine-linux-2.6.18/drivers/Makefile tmp-linux-2.6-xen.patch/drivers/Makefile --- pristine-linux-2.6.18/drivers/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -31,6 +31,7 @@ obj-y += base/ block/ misc/ mfd/ net/ obj-$(CONFIG_NUBUS) += nubus/ obj-$(CONFIG_ATM) += atm/ @@ -48137,7 +48137,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/Makefile tmp-linux-2.6-xen.patch/driver obj-$(CONFIG_SCSI) += scsi/ diff -Nurp pristine-linux-2.6.18/drivers/acpi/Kconfig tmp-linux-2.6-xen.patch/drivers/acpi/Kconfig --- pristine-linux-2.6.18/drivers/acpi/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/acpi/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/acpi/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -45,7 +45,7 @@ if ACPI config ACPI_SLEEP @@ -48157,7 +48157,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/acpi/Kconfig tmp-linux-2.6-xen.patch/dr The Power Management Timer is available on all ACPI-capable, diff -Nurp pristine-linux-2.6.18/drivers/char/mem.c tmp-linux-2.6-xen.patch/drivers/char/mem.c --- pristine-linux-2.6.18/drivers/char/mem.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/char/mem.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/mem.c 2007-11-14 15:35:27.000000000 -0800 @@ -101,6 +101,7 @@ static inline int valid_mmap_phys_addr_r } #endif @@ -48194,7 +48194,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/mem.c tmp-linux-2.6-xen.patch/driv .llseek = memory_lseek, diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/Kconfig tmp-linux-2.6-xen.patch/drivers/char/tpm/Kconfig --- pristine-linux-2.6.18/drivers/char/tpm/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/char/tpm/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/tpm/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -58,5 +58,13 @@ config TCG_INFINEON Further information on this driver and the supported hardware can be found at http://www.prosec.rub.de/tpm @@ -48212,7 +48212,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/Kconfig tmp-linux-2.6-xen.patc +endmenu diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/Makefile tmp-linux-2.6-xen.patch/drivers/char/tpm/Makefile --- pristine-linux-2.6.18/drivers/char/tpm/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/char/tpm/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/tpm/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_TIS) += tpm_tis.o obj-$(CONFIG_TCG_NSC) += tpm_nsc.o obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o @@ -48221,7 +48221,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/Makefile tmp-linux-2.6-xen.pat +tpm_xenu-y = tpm_xen.o tpm_vtpm.o diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm.h tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm.h --- pristine-linux-2.6.18/drivers/char/tpm/tpm.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm.h 2007-11-14 15:35:27.000000000 -0800 @@ -105,6 +105,9 @@ struct tpm_chip { struct dentry **bios_dir; @@ -48253,7 +48253,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm.h tmp-linux-2.6-xen.patch/ extern void tpm_continue_selftest(struct tpm_chip *); diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm_vtpm.c tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_vtpm.c --- pristine-linux-2.6.18/drivers/char/tpm/tpm_vtpm.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_vtpm.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_vtpm.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,542 @@ +/* + * Copyright (C) 2006 IBM Corporation @@ -48799,7 +48799,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm_vtpm.c tmp-linux-2.6-xen.p +} diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm_vtpm.h tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_vtpm.h --- pristine-linux-2.6.18/drivers/char/tpm/tpm_vtpm.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_vtpm.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_vtpm.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,55 @@ +#ifndef TPM_VTPM_H +#define TPM_VTPM_H @@ -48858,7 +48858,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm_vtpm.h tmp-linux-2.6-xen.p +#endif diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm_xen.c tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_xen.c --- pristine-linux-2.6.18/drivers/char/tpm/tpm_xen.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_xen.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_xen.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,720 @@ +/* + * Copyright (c) 2005, IBM Corporation @@ -49582,7 +49582,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/tpm/tpm_xen.c tmp-linux-2.6-xen.pa +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/char/tty_io.c tmp-linux-2.6-xen.patch/drivers/char/tty_io.c --- pristine-linux-2.6.18/drivers/char/tty_io.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/char/tty_io.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/char/tty_io.c 2007-11-14 15:35:27.000000000 -0800 @@ -130,6 +130,8 @@ LIST_HEAD(tty_drivers); /* linked list vt.c for deeply disgusting hack reasons */ DEFINE_MUTEX(tty_mutex); @@ -49620,7 +49620,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/char/tty_io.c tmp-linux-2.6-xen.patch/d } diff -Nurp pristine-linux-2.6.18/drivers/firmware/Kconfig tmp-linux-2.6-xen.patch/drivers/firmware/Kconfig --- pristine-linux-2.6.18/drivers/firmware/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/firmware/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/firmware/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -8,6 +8,7 @@ menu "Firmware Drivers" config EDD tristate "BIOS Enhanced Disk Drive calls determine boot disk" @@ -49631,7 +49631,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/firmware/Kconfig tmp-linux-2.6-xen.patc Services real mode BIOS calls to determine which disk diff -Nurp pristine-linux-2.6.18/drivers/ide/ide-lib.c tmp-linux-2.6-xen.patch/drivers/ide/ide-lib.c --- pristine-linux-2.6.18/drivers/ide/ide-lib.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/ide/ide-lib.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/ide/ide-lib.c 2007-11-16 16:18:12.000000000 -0800 @@ -408,10 +408,10 @@ void ide_toggle_bounce(ide_drive_t *driv { u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */ @@ -49649,7 +49649,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/ide/ide-lib.c tmp-linux-2.6-xen.patch/d diff -Nurp pristine-linux-2.6.18/drivers/oprofile/buffer_sync.c tmp-linux-2.6-xen.patch/drivers/oprofile/buffer_sync.c --- pristine-linux-2.6.18/drivers/oprofile/buffer_sync.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/oprofile/buffer_sync.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/oprofile/buffer_sync.c 2007-11-16 16:18:13.000000000 -0800 @@ -6,6 +6,10 @@ * * @author John Levon <levon@movementarian.org> @@ -49819,7 +49819,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/buffer_sync.c tmp-linux-2.6-xe mutex_unlock(&buffer_mutex); diff -Nurp pristine-linux-2.6.18/drivers/oprofile/cpu_buffer.c tmp-linux-2.6-xen.patch/drivers/oprofile/cpu_buffer.c --- pristine-linux-2.6.18/drivers/oprofile/cpu_buffer.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/oprofile/cpu_buffer.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/oprofile/cpu_buffer.c 2007-11-16 16:18:13.000000000 -0800 @@ -6,6 +6,10 @@ * * @author John Levon <levon@movementarian.org> @@ -49930,7 +49930,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/cpu_buffer.c tmp-linux-2.6-xen * the task mortuary progresses diff -Nurp pristine-linux-2.6.18/drivers/oprofile/cpu_buffer.h tmp-linux-2.6-xen.patch/drivers/oprofile/cpu_buffer.h --- pristine-linux-2.6.18/drivers/oprofile/cpu_buffer.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/oprofile/cpu_buffer.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/oprofile/cpu_buffer.h 2007-11-16 16:18:13.000000000 -0800 @@ -36,7 +36,7 @@ struct oprofile_cpu_buffer { volatile unsigned long tail_pos; unsigned long buffer_size; @@ -49955,7 +49955,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/cpu_buffer.h tmp-linux-2.6-xen #endif /* OPROFILE_CPU_BUFFER_H */ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/event_buffer.h tmp-linux-2.6-xen.patch/drivers/oprofile/event_buffer.h --- pristine-linux-2.6.18/drivers/oprofile/event_buffer.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/oprofile/event_buffer.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/oprofile/event_buffer.h 2007-11-16 16:18:13.000000000 -0800 @@ -29,15 +29,20 @@ void wake_up_buffer_waiter(void); #define CPU_SWITCH_CODE 2 #define COOKIE_SWITCH_CODE 3 @@ -49980,7 +49980,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/event_buffer.h tmp-linux-2.6-x diff -Nurp pristine-linux-2.6.18/drivers/oprofile/oprof.c tmp-linux-2.6-xen.patch/drivers/oprofile/oprof.c --- pristine-linux-2.6.18/drivers/oprofile/oprof.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/oprofile/oprof.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/oprofile/oprof.c 2007-11-16 16:18:13.000000000 -0800 @@ -5,6 +5,10 @@ * @remark Read the file COPYING * @@ -50036,7 +50036,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/oprof.c tmp-linux-2.6-xen.patc int err; diff -Nurp pristine-linux-2.6.18/drivers/oprofile/oprof.h tmp-linux-2.6-xen.patch/drivers/oprofile/oprof.h --- pristine-linux-2.6.18/drivers/oprofile/oprof.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/oprofile/oprof.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/oprofile/oprof.h 2007-11-16 16:18:13.000000000 -0800 @@ -35,5 +35,8 @@ void oprofile_create_files(struct super_ void oprofile_timer_init(struct oprofile_operations * ops); @@ -50048,7 +50048,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/oprof.h tmp-linux-2.6-xen.patc #endif /* OPROF_H */ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/oprofile_files.c tmp-linux-2.6-xen.patch/drivers/oprofile/oprofile_files.c --- pristine-linux-2.6.18/drivers/oprofile/oprofile_files.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/oprofile/oprofile_files.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/oprofile/oprofile_files.c 2007-11-16 16:18:13.000000000 -0800 @@ -5,15 +5,21 @@ * @remark Read the file COPYING * @@ -50278,7 +50278,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/oprofile/oprofile_files.c tmp-linux-2.6 oprofilefs_create_ulong(sb, root, "buffer_watershed", &fs_buffer_watershed); diff -Nurp pristine-linux-2.6.18/drivers/pci/Kconfig tmp-linux-2.6-xen.patch/drivers/pci/Kconfig --- pristine-linux-2.6.18/drivers/pci/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/pci/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/pci/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -5,6 +5,7 @@ config PCI_MSI bool "Message Signaled Interrupts (MSI and MSI-X)" depends on PCI @@ -50289,7 +50289,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/pci/Kconfig tmp-linux-2.6-xen.patch/dri Interrupts). Message Signaled Interrupts enable a device to diff -Nurp pristine-linux-2.6.18/drivers/serial/Kconfig tmp-linux-2.6-xen.patch/drivers/serial/Kconfig --- pristine-linux-2.6.18/drivers/serial/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/serial/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/serial/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -11,6 +11,7 @@ menu "Serial drivers" config SERIAL_8250 tristate "8250/16550 and compatible serial support" @@ -50300,7 +50300,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/serial/Kconfig tmp-linux-2.6-xen.patch/ This selects whether you want to include the driver for the standard diff -Nurp pristine-linux-2.6.18/drivers/video/console/Kconfig tmp-linux-2.6-xen.patch/drivers/video/console/Kconfig --- pristine-linux-2.6.18/drivers/video/console/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/drivers/video/console/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/video/console/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -53,6 +53,7 @@ config VGACON_SOFT_SCROLLBACK_SIZE config VIDEO_SELECT bool "Video mode selection support" @@ -50311,7 +50311,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/video/console/Kconfig tmp-linux-2.6-xen you want to take advantage of some high-resolution text mode your diff -Nurp pristine-linux-2.6.18/drivers/xen/Kconfig tmp-linux-2.6-xen.patch/drivers/xen/Kconfig --- pristine-linux-2.6.18/drivers/xen/Kconfig 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,277 @@ +# +# This Kconfig describe xen options @@ -50592,7 +50592,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/Kconfig tmp-linux-2.6-xen.patch/dri +endif diff -Nurp pristine-linux-2.6.18/drivers/xen/Makefile tmp-linux-2.6-xen.patch/drivers/xen/Makefile --- pristine-linux-2.6.18/drivers/xen/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,20 @@ +obj-y += core/ +obj-y += console/ @@ -50616,13 +50616,13 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/Makefile tmp-linux-2.6-xen.patch/dr +obj-$(CONFIG_XEN_KEYBOARD) += fbfront/ diff -Nurp pristine-linux-2.6.18/drivers/xen/balloon/Makefile tmp-linux-2.6-xen.patch/drivers/xen/balloon/Makefile --- pristine-linux-2.6.18/drivers/xen/balloon/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +obj-y := balloon.o sysfs.o diff -Nurp pristine-linux-2.6.18/drivers/xen/balloon/balloon.c tmp-linux-2.6-xen.patch/drivers/xen/balloon/balloon.c --- pristine-linux-2.6.18/drivers/xen/balloon/balloon.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/balloon.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/balloon.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,663 @@ +/****************************************************************************** + * balloon.c @@ -51289,7 +51289,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/balloon/balloon.c tmp-linux-2.6-xen +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/balloon/common.h tmp-linux-2.6-xen.patch/drivers/xen/balloon/common.h --- pristine-linux-2.6.18/drivers/xen/balloon/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/common.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/common.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,58 @@ +/****************************************************************************** + * balloon/common.h @@ -51351,7 +51351,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/balloon/common.h tmp-linux-2.6-xen. +#endif /* __XEN_BALLOON_COMMON_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/balloon/sysfs.c tmp-linux-2.6-xen.patch/drivers/xen/balloon/sysfs.c --- pristine-linux-2.6.18/drivers/xen/balloon/sysfs.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/sysfs.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/balloon/sysfs.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,170 @@ +/****************************************************************************** + * balloon/sysfs.c @@ -51525,14 +51525,14 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/balloon/sysfs.c tmp-linux-2.6-xen.p +} diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/Makefile tmp-linux-2.6-xen.patch/drivers/xen/blkback/Makefile --- pristine-linux-2.6.18/drivers/xen/blkback/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,3 @@ +obj-$(CONFIG_XEN_BLKDEV_BACKEND) := blkbk.o + +blkbk-y := blkback.o xenbus.o interface.o vbd.o diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/blkback.c tmp-linux-2.6-xen.patch/drivers/xen/blkback/blkback.c --- pristine-linux-2.6.18/drivers/xen/blkback/blkback.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/blkback.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/blkback.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,617 @@ +/****************************************************************************** + * arch/xen/drivers/blkif/backend/main.c @@ -52153,7 +52153,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/blkback.c tmp-linux-2.6-xen +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/common.h tmp-linux-2.6-xen.patch/drivers/xen/blkback/common.h --- pristine-linux-2.6.18/drivers/xen/blkback/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/common.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/common.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,139 @@ +/* + * This program is free software; you can redistribute it and/or @@ -52296,7 +52296,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/common.h tmp-linux-2.6-xen. +#endif /* __BLKIF__BACKEND__COMMON_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/interface.c tmp-linux-2.6-xen.patch/drivers/xen/blkback/interface.c --- pristine-linux-2.6.18/drivers/xen/blkback/interface.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/interface.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/interface.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,181 @@ +/****************************************************************************** + * arch/xen/drivers/blkif/backend/interface.c @@ -52481,7 +52481,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/interface.c tmp-linux-2.6-x +} diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/vbd.c tmp-linux-2.6-xen.patch/drivers/xen/blkback/vbd.c --- pristine-linux-2.6.18/drivers/xen/blkback/vbd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/vbd.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/vbd.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,118 @@ +/****************************************************************************** + * blkback/vbd.c @@ -52603,7 +52603,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/vbd.c tmp-linux-2.6-xen.pat +} diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/xenbus.c tmp-linux-2.6-xen.patch/drivers/xen/blkback/xenbus.c --- pristine-linux-2.6.18/drivers/xen/blkback/xenbus.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/xenbus.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkback/xenbus.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,533 @@ +/* Xenbus code for blkif backend + Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au> @@ -53140,7 +53140,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkback/xenbus.c tmp-linux-2.6-xen. +} diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/Makefile tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile --- pristine-linux-2.6.18/drivers/xen/blkfront/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,5 @@ + +obj-$(CONFIG_XEN_BLKDEV_FRONTEND) := xenblk.o @@ -53149,7 +53149,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/Makefile tmp-linux-2.6-xen + diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/blkfront.c tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c --- pristine-linux-2.6.18/drivers/xen/blkfront/blkfront.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,912 @@ +/****************************************************************************** + * blkfront.c @@ -54065,7 +54065,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/blkfront.c tmp-linux-2.6-x +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/block.h tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h --- pristine-linux-2.6.18/drivers/xen/blkfront/block.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,143 @@ +/****************************************************************************** + * block.h @@ -54212,7 +54212,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/block.h tmp-linux-2.6-xen. +#endif /* __XEN_DRIVERS_BLOCK_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/vbd.c tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c --- pristine-linux-2.6.18/drivers/xen/blkfront/vbd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,375 @@ +/****************************************************************************** + * vbd.c @@ -54591,7 +54591,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blkfront/vbd.c tmp-linux-2.6-xen.pa +#endif diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/Makefile tmp-linux-2.6-xen.patch/drivers/xen/blktap/Makefile --- pristine-linux-2.6.18/drivers/xen/blktap/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,5 @@ +LINUXINCLUDE += -I../xen/include/public/io + @@ -54600,7 +54600,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/Makefile tmp-linux-2.6-xen.p +xenblktap-y := xenbus.o interface.o blktap.o diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/blktap.c tmp-linux-2.6-xen.patch/drivers/xen/blktap/blktap.c --- pristine-linux-2.6.18/drivers/xen/blktap/blktap.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/blktap.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/blktap.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1632 @@ +/****************************************************************************** + * drivers/xen/blktap/blktap.c @@ -56236,7 +56236,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/blktap.c tmp-linux-2.6-xen.p +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/common.h tmp-linux-2.6-xen.patch/drivers/xen/blktap/common.h --- pristine-linux-2.6.18/drivers/xen/blktap/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/common.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/common.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,121 @@ +/* + * This program is free software; you can redistribute it and/or @@ -56361,7 +56361,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/common.h tmp-linux-2.6-xen.p +#endif /* __BLKIF__BACKEND__COMMON_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/interface.c tmp-linux-2.6-xen.patch/drivers/xen/blktap/interface.c --- pristine-linux-2.6.18/drivers/xen/blktap/interface.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/interface.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/interface.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,174 @@ +/****************************************************************************** + * drivers/xen/blktap/interface.c @@ -56539,7 +56539,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/interface.c tmp-linux-2.6-xe +} diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/xenbus.c tmp-linux-2.6-xen.patch/drivers/xen/blktap/xenbus.c --- pristine-linux-2.6.18/drivers/xen/blktap/xenbus.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/xenbus.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/blktap/xenbus.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,477 @@ +/* drivers/xen/blktap/xenbus.c + * @@ -57020,13 +57020,13 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/blktap/xenbus.c tmp-linux-2.6-xen.p +} diff -Nurp pristine-linux-2.6.18/drivers/xen/char/Makefile tmp-linux-2.6-xen.patch/drivers/xen/char/Makefile --- pristine-linux-2.6.18/drivers/xen/char/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/char/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/char/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +obj-y := mem.o diff -Nurp pristine-linux-2.6.18/drivers/xen/char/mem.c tmp-linux-2.6-xen.patch/drivers/xen/char/mem.c --- pristine-linux-2.6.18/drivers/xen/char/mem.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/char/mem.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/char/mem.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,203 @@ +/* + * Originally from linux/drivers/char/mem.c @@ -57233,13 +57233,13 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/char/mem.c tmp-linux-2.6-xen.patch/ +}; diff -Nurp pristine-linux-2.6.18/drivers/xen/console/Makefile tmp-linux-2.6-xen.patch/drivers/xen/console/Makefile --- pristine-linux-2.6.18/drivers/xen/console/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/console/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/console/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +obj-y := console.o xencons_ring.o diff -Nurp pristine-linux-2.6.18/drivers/xen/console/console.c tmp-linux-2.6-xen.patch/drivers/xen/console/console.c --- pristine-linux-2.6.18/drivers/xen/console/console.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/console/console.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/console/console.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,721 @@ +/****************************************************************************** + * console.c @@ -57964,7 +57964,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/console/console.c tmp-linux-2.6-xen +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/console/xencons_ring.c tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.c --- pristine-linux-2.6.18/drivers/xen/console/xencons_ring.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,143 @@ +/* + * This program is free software; you can redistribute it and/or @@ -58111,7 +58111,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/console/xencons_ring.c tmp-linux-2. +} diff -Nurp pristine-linux-2.6.18/drivers/xen/core/Makefile tmp-linux-2.6-xen.patch/drivers/xen/core/Makefile --- pristine-linux-2.6.18/drivers/xen/core/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,12 @@ +# +# Makefile for the linux kernel. @@ -58127,7 +58127,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/Makefile tmp-linux-2.6-xen.pat +obj-$(CONFIG_KEXEC) += machine_kexec.o diff -Nurp pristine-linux-2.6.18/drivers/xen/core/cpu_hotplug.c tmp-linux-2.6-xen.patch/drivers/xen/core/cpu_hotplug.c --- pristine-linux-2.6.18/drivers/xen/core/cpu_hotplug.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/cpu_hotplug.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/cpu_hotplug.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,172 @@ +#include <linux/init.h> +#include <linux/kernel.h> @@ -58303,7 +58303,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/cpu_hotplug.c tmp-linux-2.6-xe +} diff -Nurp pristine-linux-2.6.18/drivers/xen/core/evtchn.c tmp-linux-2.6-xen.patch/drivers/xen/core/evtchn.c --- pristine-linux-2.6.18/drivers/xen/core/evtchn.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/evtchn.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/evtchn.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1015 @@ +/****************************************************************************** + * evtchn.c @@ -59322,7 +59322,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/evtchn.c tmp-linux-2.6-xen.pat +} diff -Nurp pristine-linux-2.6.18/drivers/xen/core/features.c tmp-linux-2.6-xen.patch/drivers/xen/core/features.c --- pristine-linux-2.6.18/drivers/xen/core/features.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/features.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/features.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,34 @@ +/****************************************************************************** + * features.c @@ -59360,7 +59360,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/features.c tmp-linux-2.6-xen.p +} diff -Nurp pristine-linux-2.6.18/drivers/xen/core/gnttab.c tmp-linux-2.6-xen.patch/drivers/xen/core/gnttab.c --- pristine-linux-2.6.18/drivers/xen/core/gnttab.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/gnttab.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/gnttab.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,631 @@ +/****************************************************************************** + * gnttab.c @@ -59995,7 +59995,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/gnttab.c tmp-linux-2.6-xen.pat +#endif diff -Nurp pristine-linux-2.6.18/drivers/xen/core/hypervisor_sysfs.c tmp-linux-2.6-xen.patch/drivers/xen/core/hypervisor_sysfs.c --- pristine-linux-2.6.18/drivers/xen/core/hypervisor_sysfs.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/hypervisor_sysfs.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/hypervisor_sysfs.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,56 @@ +/* + * copyright (c) 2006 IBM Corporation @@ -60055,7 +60055,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/hypervisor_sysfs.c tmp-linux-2 +device_initcall(hypervisor_subsys_init); diff -Nurp pristine-linux-2.6.18/drivers/xen/core/machine_kexec.c tmp-linux-2.6-xen.patch/drivers/xen/core/machine_kexec.c --- pristine-linux-2.6.18/drivers/xen/core/machine_kexec.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/machine_kexec.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/machine_kexec.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,189 @@ +/* + * drivers/xen/core/machine_kexec.c @@ -60248,7 +60248,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/machine_kexec.c tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/machine_reboot.c tmp-linux-2.6-xen.patch/drivers/xen/core/machine_reboot.c --- pristine-linux-2.6.18/drivers/xen/core/machine_reboot.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/machine_reboot.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/machine_reboot.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,241 @@ +#include <linux/version.h> +#include <linux/kernel.h> @@ -60493,7 +60493,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/machine_reboot.c tmp-linux-2.6 +} diff -Nurp pristine-linux-2.6.18/drivers/xen/core/reboot.c tmp-linux-2.6-xen.patch/drivers/xen/core/reboot.c --- pristine-linux-2.6.18/drivers/xen/core/reboot.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/reboot.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/reboot.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,243 @@ +#define __KERNEL_SYSCALLS__ +#include <linux/version.h> @@ -60740,7 +60740,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/reboot.c tmp-linux-2.6-xen.pat +#endif /* !defined(CONFIG_XEN) */ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/smpboot.c tmp-linux-2.6-xen.patch/drivers/xen/core/smpboot.c --- pristine-linux-2.6.18/drivers/xen/core/smpboot.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/smpboot.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/smpboot.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,452 @@ +/* + * Xen SMP booting functions @@ -61196,7 +61196,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/smpboot.c tmp-linux-2.6-xen.pa +#endif diff -Nurp pristine-linux-2.6.18/drivers/xen/core/xen_proc.c tmp-linux-2.6-xen.patch/drivers/xen/core/xen_proc.c --- pristine-linux-2.6.18/drivers/xen/core/xen_proc.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/xen_proc.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/xen_proc.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,23 @@ + +#include <linux/module.h> @@ -61223,7 +61223,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/xen_proc.c tmp-linux-2.6-xen.p +EXPORT_SYMBOL_GPL(remove_xen_proc_entry); diff -Nurp pristine-linux-2.6.18/drivers/xen/core/xen_sysfs.c tmp-linux-2.6-xen.patch/drivers/xen/core/xen_sysfs.c --- pristine-linux-2.6.18/drivers/xen/core/xen_sysfs.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/core/xen_sysfs.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/core/xen_sysfs.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,378 @@ +/* + * copyright (c) 2006 IBM Corporation @@ -61605,13 +61605,13 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/core/xen_sysfs.c tmp-linux-2.6-xen. +module_exit(hyper_sysfs_exit); diff -Nurp pristine-linux-2.6.18/drivers/xen/evtchn/Makefile tmp-linux-2.6-xen.patch/drivers/xen/evtchn/Makefile --- pristine-linux-2.6.18/drivers/xen/evtchn/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/evtchn/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/evtchn/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +obj-y := evtchn.o diff -Nurp pristine-linux-2.6.18/drivers/xen/evtchn/evtchn.c tmp-linux-2.6-xen.patch/drivers/xen/evtchn/evtchn.c --- pristine-linux-2.6.18/drivers/xen/evtchn/evtchn.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/evtchn/evtchn.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/evtchn/evtchn.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,469 @@ +/****************************************************************************** + * evtchn.c @@ -62084,13 +62084,13 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/evtchn/evtchn.c tmp-linux-2.6-xen.p +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/fbfront/Makefile tmp-linux-2.6-xen.patch/drivers/xen/fbfront/Makefile --- pristine-linux-2.6.18/drivers/xen/fbfront/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/fbfront/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/fbfront/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ +obj-$(CONFIG_XEN_FRAMEBUFFER) := xenfb.o +obj-$(CONFIG_XEN_KEYBOARD) += xenkbd.o diff -Nurp pristine-linux-2.6.18/drivers/xen/fbfront/xenfb.c tmp-linux-2.6-xen.patch/drivers/xen/fbfront/xenfb.c --- pristine-linux-2.6.18/drivers/xen/fbfront/xenfb.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/fbfront/xenfb.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/fbfront/xenfb.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,753 @@ +/* + * linux/drivers/video/xenfb.c -- Xen para-virtual frame buffer device @@ -62847,7 +62847,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/fbfront/xenfb.c tmp-linux-2.6-xen.p +MODULE_LICENSE("GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/fbfront/xenkbd.c tmp-linux-2.6-xen.patch/drivers/xen/fbfront/xenkbd.c --- pristine-linux-2.6.18/drivers/xen/fbfront/xenkbd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/fbfront/xenkbd.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/fbfront/xenkbd.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,334 @@ +/* + * linux/drivers/input/keyboard/xenkbd.c -- Xen para-virtual input device @@ -63185,12 +63185,12 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/fbfront/xenkbd.c tmp-linux-2.6-xen. +MODULE_LICENSE("GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/gntdev/Makefile tmp-linux-2.6-xen.patch/drivers/xen/gntdev/Makefile --- pristine-linux-2.6.18/drivers/xen/gntdev/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/gntdev/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/gntdev/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1 @@ +obj-y := gntdev.o diff -Nurp pristine-linux-2.6.18/drivers/xen/gntdev/gntdev.c tmp-linux-2.6-xen.patch/drivers/xen/gntdev/gntdev.c --- pristine-linux-2.6.18/drivers/xen/gntdev/gntdev.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/gntdev/gntdev.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/gntdev/gntdev.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,973 @@ +/****************************************************************************** + * gntdev.c @@ -64167,7 +64167,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/gntdev/gntdev.c tmp-linux-2.6-xen.p +} diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/Makefile tmp-linux-2.6-xen.patch/drivers/xen/netback/Makefile --- pristine-linux-2.6.18/drivers/xen/netback/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netback/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netback/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,5 @@ +obj-$(CONFIG_XEN_NETDEV_BACKEND) := netbk.o +obj-$(CONFIG_XEN_NETDEV_LOOPBACK) += netloop.o @@ -64176,7 +64176,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/Makefile tmp-linux-2.6-xen. +netloop-y := loopback.o diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/common.h tmp-linux-2.6-xen.patch/drivers/xen/netback/common.h --- pristine-linux-2.6.18/drivers/xen/netback/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netback/common.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netback/common.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,157 @@ +/****************************************************************************** + * arch/xen/drivers/netif/backend/common.h @@ -64337,7 +64337,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/common.h tmp-linux-2.6-xen. +#endif /* __NETIF__BACKEND__COMMON_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/interface.c tmp-linux-2.6-xen.patch/drivers/xen/netback/interface.c --- pristine-linux-2.6.18/drivers/xen/netback/interface.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netback/interface.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netback/interface.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,336 @@ +/****************************************************************************** + * arch/xen/drivers/netif/backend/interface.c @@ -64677,7 +64677,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/interface.c tmp-linux-2.6-x +} diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/loopback.c tmp-linux-2.6-xen.patch/drivers/xen/netback/loopback.c --- pristine-linux-2.6.18/drivers/xen/netback/loopback.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netback/loopback.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netback/loopback.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,324 @@ +/****************************************************************************** + * netback/loopback.c @@ -65005,7 +65005,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/loopback.c tmp-linux-2.6-xe +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/netback.c tmp-linux-2.6-xen.patch/drivers/xen/netback/netback.c --- pristine-linux-2.6.18/drivers/xen/netback/netback.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netback/netback.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netback/netback.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1496 @@ +/****************************************************************************** + * drivers/xen/netback/netback.c @@ -66505,7 +66505,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/netback.c tmp-linux-2.6-xen +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/xenbus.c tmp-linux-2.6-xen.patch/drivers/xen/netback/xenbus.c --- pristine-linux-2.6.18/drivers/xen/netback/xenbus.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netback/xenbus.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netback/xenbus.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,448 @@ +/* Xenbus code for netif backend + Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au> @@ -66957,7 +66957,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netback/xenbus.c tmp-linux-2.6-xen. +} diff -Nurp pristine-linux-2.6.18/drivers/xen/netfront/Makefile tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile --- pristine-linux-2.6.18/drivers/xen/netfront/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,4 @@ + +obj-$(CONFIG_XEN_NETDEV_FRONTEND) := xennet.o @@ -66965,7 +66965,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netfront/Makefile tmp-linux-2.6-xen +xennet-objs := netfront.o diff -Nurp pristine-linux-2.6.18/drivers/xen/netfront/netfront.c tmp-linux-2.6-xen.patch/drivers/xen/netfront/netfront.c --- pristine-linux-2.6.18/drivers/xen/netfront/netfront.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/netfront/netfront.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/netfront/netfront.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2172 @@ +/****************************************************************************** + * Virtual network driver for conversing with remote driver backends. @@ -69141,7 +69141,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/netfront/netfront.c tmp-linux-2.6-x +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/Makefile tmp-linux-2.6-xen.patch/drivers/xen/pciback/Makefile --- pristine-linux-2.6.18/drivers/xen/pciback/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,16 @@ +obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback.o + @@ -69161,7 +69161,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/Makefile tmp-linux-2.6-xen. +endif diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space.c --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,426 @@ +/* + * PCI Backend - Functions for creating a virtual configuration space for @@ -69591,7 +69591,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space.c tmp-linux-2.6- +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space.h tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space.h --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,126 @@ +/* + * PCI Backend - Common data structures for overriding the configuration space @@ -69721,7 +69721,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space.h tmp-linux-2.6- +#endif /* __XEN_PCIBACK_CONF_SPACE_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability.c --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,71 @@ +/* + * PCI Backend - Handles the virtual fields found on the capability lists @@ -69796,7 +69796,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability.c tmp +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability.h tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability.h --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,23 @@ +/* + * PCI Backend - Data structures for special overlays for structures on @@ -69823,7 +69823,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability.h tmp +#endif diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability_pm.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability_pm.c --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability_pm.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability_pm.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability_pm.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,128 @@ +/* + * PCI Backend - Configuration space overlay for power management @@ -69955,7 +69955,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability_pm.c +}; diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability_vpd.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability_vpd.c --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability_vpd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability_vpd.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_capability_vpd.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,42 @@ +/* + * PCI Backend - Configuration space overlay for Vital Product Data @@ -70001,7 +70001,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_capability_vpd.c +}; diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_header.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_header.c --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space_header.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_header.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_header.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,323 @@ +/* + * PCI Backend - Handles the virtual fields in the configuration space headers. @@ -70328,7 +70328,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_header.c tmp-lin +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_quirks.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_quirks.c --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space_quirks.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_quirks.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_quirks.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,126 @@ +/* + * PCI Backend - Handle special overlays for broken devices. @@ -70458,7 +70458,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_quirks.c tmp-lin +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_quirks.h tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_quirks.h --- pristine-linux-2.6.18/drivers/xen/pciback/conf_space_quirks.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_quirks.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/conf_space_quirks.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,35 @@ +/* + * PCI Backend - Data structures for special overlays for broken devices. @@ -70497,7 +70497,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/conf_space_quirks.h tmp-lin +#endif diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/controller.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/controller.c --- pristine-linux-2.6.18/drivers/xen/pciback/controller.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/controller.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/controller.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,404 @@ +/* + * Copyright (C) 2007 Hewlett-Packard Development Company, L.P. @@ -70905,7 +70905,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/controller.c tmp-linux-2.6- +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/passthrough.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/passthrough.c --- pristine-linux-2.6.18/drivers/xen/pciback/passthrough.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/passthrough.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/passthrough.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,157 @@ +/* + * PCI Backend - Provides restricted access to the real PCI bus topology @@ -71066,7 +71066,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/passthrough.c tmp-linux-2.6 +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/pci_stub.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/pci_stub.c --- pristine-linux-2.6.18/drivers/xen/pciback/pci_stub.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/pci_stub.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/pci_stub.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,929 @@ +/* + * PCI Stub Driver - Grabs devices in backend to be exported later @@ -71999,7 +71999,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/pci_stub.c tmp-linux-2.6-xe +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/pciback.h tmp-linux-2.6-xen.patch/drivers/xen/pciback/pciback.h --- pristine-linux-2.6.18/drivers/xen/pciback/pciback.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/pciback.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/pciback.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,93 @@ +/* + * PCI Backend Common Data Structures & Function Declarations @@ -72096,7 +72096,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/pciback.h tmp-linux-2.6-xen +#endif diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/pciback_ops.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/pciback_ops.c --- pristine-linux-2.6.18/drivers/xen/pciback/pciback_ops.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/pciback_ops.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/pciback_ops.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,95 @@ +/* + * PCI Backend Operations - respond to PCI requests from Frontend @@ -72195,7 +72195,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/pciback_ops.c tmp-linux-2.6 +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/slot.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/slot.c --- pristine-linux-2.6.18/drivers/xen/pciback/slot.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/slot.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/slot.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,151 @@ +/* + * PCI Backend - Provides a Virtual PCI bus (with real devices) @@ -72350,7 +72350,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/slot.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/vpci.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/vpci.c --- pristine-linux-2.6.18/drivers/xen/pciback/vpci.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/vpci.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/vpci.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,204 @@ +/* + * PCI Backend - Provides a Virtual PCI bus (with real devices) @@ -72558,7 +72558,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/vpci.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/xenbus.c tmp-linux-2.6-xen.patch/drivers/xen/pciback/xenbus.c --- pristine-linux-2.6.18/drivers/xen/pciback/xenbus.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/xenbus.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pciback/xenbus.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,454 @@ +/* + * PCI Backend Xenbus Setup - handles setup with frontend and xend @@ -73016,7 +73016,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pciback/xenbus.c tmp-linux-2.6-xen. +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/Makefile tmp-linux-2.6-xen.patch/drivers/xen/pcifront/Makefile --- pristine-linux-2.6.18/drivers/xen/pcifront/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,7 @@ +obj-y += pcifront.o + @@ -73027,7 +73027,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/Makefile tmp-linux-2.6-xen +endif diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/pci.c tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pci.c --- pristine-linux-2.6.18/drivers/xen/pcifront/pci.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pci.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pci.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,46 @@ +/* + * PCI Frontend Operations - ensure only one PCI frontend runs at a time @@ -73077,7 +73077,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/pci.c tmp-linux-2.6-xen.pa +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/pci_op.c tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pci_op.c --- pristine-linux-2.6.18/drivers/xen/pcifront/pci_op.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pci_op.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pci_op.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,386 @@ +/* + * PCI Frontend Operations - Communicates with frontend @@ -73467,7 +73467,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/pci_op.c tmp-linux-2.6-xen +} diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/pcifront.h tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pcifront.h --- pristine-linux-2.6.18/drivers/xen/pcifront/pcifront.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pcifront.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/pcifront.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,40 @@ +/* + * PCI Frontend - Common data structures & function declarations @@ -73511,7 +73511,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/pcifront.h tmp-linux-2.6-x +#endif /* __XEN_PCIFRONT_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/xenbus.c tmp-linux-2.6-xen.patch/drivers/xen/pcifront/xenbus.c --- pristine-linux-2.6.18/drivers/xen/pcifront/xenbus.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/xenbus.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/pcifront/xenbus.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,296 @@ +/* + * PCI Frontend Xenbus Setup - handles setup with backend (imports page/evtchn) @@ -73811,13 +73811,13 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/pcifront/xenbus.c tmp-linux-2.6-xen +subsys_initcall(pcifront_init); diff -Nurp pristine-linux-2.6.18/drivers/xen/privcmd/Makefile tmp-linux-2.6-xen.patch/drivers/xen/privcmd/Makefile --- pristine-linux-2.6.18/drivers/xen/privcmd/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/privcmd/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/privcmd/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +obj-$(CONFIG_XEN_PRIVCMD) := privcmd.o diff -Nurp pristine-linux-2.6.18/drivers/xen/privcmd/privcmd.c tmp-linux-2.6-xen.patch/drivers/xen/privcmd/privcmd.c --- pristine-linux-2.6.18/drivers/xen/privcmd/privcmd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/privcmd/privcmd.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/privcmd/privcmd.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,286 @@ +/****************************************************************************** + * privcmd.c @@ -74107,7 +74107,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/privcmd/privcmd.c tmp-linux-2.6-xen +__initcall(privcmd_init); diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/Makefile tmp-linux-2.6-xen.patch/drivers/xen/tpmback/Makefile --- pristine-linux-2.6.18/drivers/xen/tpmback/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,4 @@ + +obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmbk.o @@ -74115,7 +74115,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/Makefile tmp-linux-2.6-xen. +tpmbk-y += tpmback.o interface.o xenbus.o diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/common.h tmp-linux-2.6-xen.patch/drivers/xen/tpmback/common.h --- pristine-linux-2.6.18/drivers/xen/tpmback/common.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/common.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/common.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,85 @@ +/****************************************************************************** + * drivers/xen/tpmback/common.h @@ -74204,7 +74204,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/common.h tmp-linux-2.6-xen. +#endif /* __TPMIF__BACKEND__COMMON_H__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/interface.c tmp-linux-2.6-xen.patch/drivers/xen/tpmback/interface.c --- pristine-linux-2.6.18/drivers/xen/tpmback/interface.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/interface.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/interface.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,167 @@ + /***************************************************************************** + * drivers/xen/tpmback/interface.c @@ -74375,7 +74375,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/interface.c tmp-linux-2.6-x +} diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/tpmback.c tmp-linux-2.6-xen.patch/drivers/xen/tpmback/tpmback.c --- pristine-linux-2.6.18/drivers/xen/tpmback/tpmback.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/tpmback.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/tpmback.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,944 @@ +/****************************************************************************** + * drivers/xen/tpmback/tpmback.c @@ -75323,7 +75323,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/tpmback.c tmp-linux-2.6-xen +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/xenbus.c tmp-linux-2.6-xen.patch/drivers/xen/tpmback/xenbus.c --- pristine-linux-2.6.18/drivers/xen/tpmback/xenbus.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/xenbus.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/tpmback/xenbus.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,289 @@ +/* Xenbus code for tpmif backend + Copyright (C) 2005 IBM Corporation @@ -75616,7 +75616,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/tpmback/xenbus.c tmp-linux-2.6-xen. +} diff -Nurp pristine-linux-2.6.18/drivers/xen/util.c tmp-linux-2.6-xen.patch/drivers/xen/util.c --- pristine-linux-2.6.18/drivers/xen/util.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/util.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/util.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,70 @@ +#include <linux/mm.h> +#include <linux/module.h> @@ -75690,7 +75690,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/util.c tmp-linux-2.6-xen.patch/driv +#endif /* !__ia64__ */ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/Makefile tmp-linux-2.6-xen.patch/drivers/xen/xenbus/Makefile --- pristine-linux-2.6.18/drivers/xen/xenbus/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,9 @@ +obj-y += xenbus_client.o xenbus_comms.o xenbus_xs.o xenbus_probe.o +obj-$(CONFIG_XEN_BACKEND) += xenbus_be.o @@ -75703,7 +75703,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/Makefile tmp-linux-2.6-xen.p +obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_backend_client.c tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_backend_client.c --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_backend_client.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_backend_client.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_backend_client.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,147 @@ +/****************************************************************************** + * Backend-client-facing interface for the Xenbus driver. In other words, the @@ -75854,7 +75854,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_backend_client.c tmp- +MODULE_LICENSE("Dual BSD/GPL"); diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_client.c tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_client.c --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_client.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_client.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_client.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,283 @@ +/****************************************************************************** + * Client-facing interface for the Xenbus driver. In other words, the @@ -76141,7 +76141,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_client.c tmp-linux-2. +EXPORT_SYMBOL_GPL(xenbus_read_driver_state); diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_comms.c tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.c --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_comms.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,232 @@ +/****************************************************************************** + * xenbus_comms.c @@ -76377,7 +76377,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_comms.c tmp-linux-2.6 +} diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_comms.h tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.h --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_comms.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,46 @@ +/* + * Private include for xenbus communications. @@ -76427,7 +76427,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_comms.h tmp-linux-2.6 +#endif /* _XENBUS_COMMS_H */ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_dev.c tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_dev.c --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_dev.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_dev.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_dev.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,404 @@ +/* + * xenbus_dev.c @@ -76835,7 +76835,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_dev.c tmp-linux-2.6-x +} diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe.c tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.c --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,1132 @@ +/****************************************************************************** + * Talks to Xen Store to figure out what devices we have. @@ -77971,7 +77971,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe.c tmp-linux-2.6 +#endif diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe.h tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.h --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,75 @@ +/****************************************************************************** + * xenbus_probe.h @@ -78050,7 +78050,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe.h tmp-linux-2.6 + diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe_backend.c tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe_backend.c --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe_backend.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe_backend.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe_backend.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,287 @@ +/****************************************************************************** + * Talks to Xen Store to figure out what devices we have (backend half). @@ -78341,7 +78341,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_probe_backend.c tmp-l +} diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_xs.c tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_xs.c --- pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_xs.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_xs.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_xs.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,886 @@ +/****************************************************************************** + * xenbus_xs.c @@ -79231,7 +79231,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenbus/xenbus_xs.c tmp-linux-2.6-xe +} diff -Nurp pristine-linux-2.6.18/drivers/xen/xenoprof/xenoprofile.c tmp-linux-2.6-xen.patch/drivers/xen/xenoprof/xenoprofile.c --- pristine-linux-2.6.18/drivers/xen/xenoprof/xenoprofile.c 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/drivers/xen/xenoprof/xenoprofile.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/drivers/xen/xenoprof/xenoprofile.c 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,500 @@ +/** + * @file xenoprofile.c @@ -79735,7 +79735,7 @@ diff -Nurp pristine-linux-2.6.18/drivers/xen/xenoprof/xenoprofile.c tmp-linux-2. +} diff -Nurp pristine-linux-2.6.18/fs/Kconfig tmp-linux-2.6-xen.patch/fs/Kconfig --- pristine-linux-2.6.18/fs/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/fs/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/fs/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -865,6 +865,7 @@ config TMPFS config HUGETLBFS bool "HugeTLB file system support" @@ -79746,7 +79746,7 @@ diff -Nurp pristine-linux-2.6.18/fs/Kconfig tmp-linux-2.6-xen.patch/fs/Kconfig ramfs. For architectures that support it, say Y here and read diff -Nurp pristine-linux-2.6.18/fs/aio.c tmp-linux-2.6-xen.patch/fs/aio.c --- pristine-linux-2.6.18/fs/aio.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/fs/aio.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/fs/aio.c 2007-11-16 16:18:12.000000000 -0800 @@ -34,6 +34,11 @@ #include <asm/uaccess.h> #include <asm/mmu_context.h> @@ -79932,7 +79932,7 @@ diff -Nurp pristine-linux-2.6.18/fs/aio.c tmp-linux-2.6-xen.patch/fs/aio.c io_destroy(ioctx); diff -Nurp pristine-linux-2.6.18/fs/eventpoll.c tmp-linux-2.6-xen.patch/fs/eventpoll.c --- pristine-linux-2.6.18/fs/eventpoll.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/fs/eventpoll.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/fs/eventpoll.c 2007-11-16 16:18:12.000000000 -0800 @@ -236,8 +236,6 @@ struct ep_pqueue { static void ep_poll_safewake_init(struct poll_safewake *psw); @@ -80009,7 +80009,7 @@ diff -Nurp pristine-linux-2.6.18/fs/eventpoll.c tmp-linux-2.6-xen.patch/fs/event * Mark the inode dirty from the very beginning, diff -Nurp pristine-linux-2.6.18/fs/proc/proc_misc.c tmp-linux-2.6-xen.patch/fs/proc/proc_misc.c --- pristine-linux-2.6.18/fs/proc/proc_misc.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/fs/proc/proc_misc.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/fs/proc/proc_misc.c 2007-11-16 16:18:13.000000000 -0800 @@ -471,7 +471,7 @@ static int show_stat(struct seq_file *p, (unsigned long long)cputime64_to_clock_t(irq), (unsigned long long)cputime64_to_clock_t(softirq), @@ -80021,7 +80021,7 @@ diff -Nurp pristine-linux-2.6.18/fs/proc/proc_misc.c tmp-linux-2.6-xen.patch/fs/ user = kstat_cpu(i).cpustat.user; diff -Nurp pristine-linux-2.6.18/fs/proc/vmcore.c tmp-linux-2.6-xen.patch/fs/proc/vmcore.c --- pristine-linux-2.6.18/fs/proc/vmcore.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/fs/proc/vmcore.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/fs/proc/vmcore.c 2007-11-16 16:18:13.000000000 -0800 @@ -514,7 +514,7 @@ static int __init parse_crash_elf64_head /* Do some basic Verification. */ if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 || @@ -80031,9 +80031,32 @@ diff -Nurp pristine-linux-2.6.18/fs/proc/vmcore.c tmp-linux-2.6-xen.patch/fs/pro ehdr.e_ident[EI_CLASS] != ELFCLASS64 || ehdr.e_ident[EI_VERSION] != EV_CURRENT || ehdr.e_version != EV_CURRENT || +diff -Nurp pristine-linux-2.6.18/fs/xfs/linux-2.6/xfs_buf.c tmp-linux-2.6-xen.patch/fs/xfs/linux-2.6/xfs_buf.c +--- pristine-linux-2.6.18/fs/xfs/linux-2.6/xfs_buf.c 2006-09-19 20:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/fs/xfs/linux-2.6/xfs_buf.c 2007-11-14 15:35:27.000000000 -0800 +@@ -182,6 +182,19 @@ free_address( + { + a_list_t *aentry; + ++#ifdef CONFIG_XEN ++ /* ++ * Xen needs to be able to make sure it can get an exclusive ++ * RO mapping of pages it wants to turn into a pagetable. If ++ * a newly allocated page is also still being vmap()ed by xfs, ++ * it will cause pagetable construction to fail. This is a ++ * quick workaround to always eagerly unmap pages so that Xen ++ * is happy. ++ */ ++ vunmap(addr); ++ return; ++#endif ++ + aentry = kmalloc(sizeof(a_list_t), GFP_NOWAIT); + if (likely(aentry)) { + spin_lock(&as_lock); diff -Nurp pristine-linux-2.6.18/include/asm-generic/pci.h tmp-linux-2.6-xen.patch/include/asm-generic/pci.h --- pristine-linux-2.6.18/include/asm-generic/pci.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-generic/pci.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-generic/pci.h 2007-11-14 15:35:27.000000000 -0800 @@ -43,7 +43,9 @@ pcibios_select_root(struct pci_dev *pdev return root; } @@ -80046,7 +80069,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-generic/pci.h tmp-linux-2.6-xen.pat static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) diff -Nurp pristine-linux-2.6.18/include/asm-generic/vmlinux.lds.h tmp-linux-2.6-xen.patch/include/asm-generic/vmlinux.lds.h --- pristine-linux-2.6.18/include/asm-generic/vmlinux.lds.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-generic/vmlinux.lds.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-generic/vmlinux.lds.h 2007-11-16 16:18:13.000000000 -0800 @@ -194,3 +194,6 @@ .stab.index 0 : { *(.stab.index) } \ .stab.indexstr 0 : { *(.stab.indexstr) } \ @@ -80056,7 +80079,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-generic/vmlinux.lds.h tmp-linux-2.6 + .notes : { *(.note.*) } :note diff -Nurp pristine-linux-2.6.18/include/asm-i386/apic.h tmp-linux-2.6-xen.patch/include/asm-i386/apic.h --- pristine-linux-2.6.18/include/asm-i386/apic.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/apic.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/apic.h 2007-11-14 15:35:27.000000000 -0800 @@ -119,10 +119,12 @@ extern void enable_NMI_through_LVT0 (voi extern int disable_timer_pin_1; @@ -80072,7 +80095,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/apic.h tmp-linux-2.6-xen.patch diff -Nurp pristine-linux-2.6.18/include/asm-i386/fixmap.h tmp-linux-2.6-xen.patch/include/asm-i386/fixmap.h --- pristine-linux-2.6.18/include/asm-i386/fixmap.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/fixmap.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/fixmap.h 2007-11-16 16:18:13.000000000 -0800 @@ -19,7 +19,7 @@ * Leave one empty page between vmalloc'ed areas and * the start of the fixmap. @@ -80093,7 +80116,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/fixmap.h tmp-linux-2.6-xen.pat /* diff -Nurp pristine-linux-2.6.18/include/asm-i386/kexec.h tmp-linux-2.6-xen.patch/include/asm-i386/kexec.h --- pristine-linux-2.6.18/include/asm-i386/kexec.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/kexec.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/kexec.h 2007-11-14 15:35:27.000000000 -0800 @@ -1,6 +1,26 @@ #ifndef _I386_KEXEC_H #define _I386_KEXEC_H @@ -80160,7 +80183,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/kexec.h tmp-linux-2.6-xen.patc #endif /* _I386_KEXEC_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-default/mach_traps.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-default/mach_traps.h --- pristine-linux-2.6.18/include/asm-i386/mach-default/mach_traps.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-default/mach_traps.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-default/mach_traps.h 2007-11-14 15:35:27.000000000 -0800 @@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig outb(reason, 0x61); } @@ -80182,7 +80205,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-default/mach_traps.h tmp- return inb(0x61); diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/agp.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/agp.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/agp.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/agp.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/agp.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,37 @@ +#ifndef AGP_H +#define AGP_H 1 @@ -80223,7 +80246,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/agp.h tmp-linux-2 +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/desc.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/desc.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/desc.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/desc.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/desc.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,164 @@ +#ifndef __ARCH_DESC_H +#define __ARCH_DESC_H @@ -80391,7 +80414,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/desc.h tmp-linux- +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/dma-mapping.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/dma-mapping.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/dma-mapping.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/dma-mapping.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/dma-mapping.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,157 @@ +#ifndef _ASM_I386_DMA_MAPPING_H +#define _ASM_I386_DMA_MAPPING_H @@ -80552,7 +80575,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/dma-mapping.h tmp +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/fixmap.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/fixmap.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/fixmap.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/fixmap.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/fixmap.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,155 @@ +/* + * fixmap.h: compile-time virtual memory allocation @@ -80711,7 +80734,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/fixmap.h tmp-linu +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/floppy.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/floppy.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/floppy.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/floppy.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/floppy.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,147 @@ +/* + * Architecture specific parts of the Floppy driver @@ -80862,7 +80885,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/floppy.h tmp-linu +#endif /* __ASM_XEN_I386_FLOPPY_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/highmem.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/highmem.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/highmem.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/highmem.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/highmem.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,80 @@ +/* + * highmem.h: virtual kernel memory mappings for high memory @@ -80946,7 +80969,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/highmem.h tmp-lin +#endif /* _ASM_HIGHMEM_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hw_irq.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hw_irq.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hw_irq.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hw_irq.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hw_irq.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,72 @@ +#ifndef _ASM_HW_IRQ_H +#define _ASM_HW_IRQ_H @@ -81022,7 +81045,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hw_irq.h tmp-linu +#endif /* _ASM_HW_IRQ_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hypercall.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hypercall.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hypercall.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hypercall.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hypercall.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,407 @@ +/****************************************************************************** + * hypercall.h @@ -81433,7 +81456,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hypercall.h tmp-l +#endif /* __HYPERCALL_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hypervisor.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hypervisor.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hypervisor.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hypervisor.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/hypervisor.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,265 @@ +/****************************************************************************** + * hypervisor.h @@ -81702,7 +81725,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/hypervisor.h tmp- +#endif /* __HYPERVISOR_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/io.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/io.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/io.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/io.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/io.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,390 @@ +#ifndef _ASM_IO_H +#define _ASM_IO_H @@ -82096,7 +82119,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/io.h tmp-linux-2. +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/irqflags.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/irqflags.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/irqflags.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/irqflags.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/irqflags.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,127 @@ +/* + * include/asm-i386/irqflags.h @@ -82227,7 +82250,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/irqflags.h tmp-li +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/maddr.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/maddr.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/maddr.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/maddr.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/maddr.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,193 @@ +#ifndef _I386_MADDR_H +#define _I386_MADDR_H @@ -82424,7 +82447,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/maddr.h tmp-linux +#endif /* _I386_MADDR_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/mmu.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/mmu.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/mmu.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/mmu.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/mmu.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,29 @@ +#ifndef __i386_MMU_H +#define __i386_MMU_H @@ -82457,7 +82480,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/mmu.h tmp-linux-2 +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/mmu_context.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/mmu_context.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/mmu_context.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/mmu_context.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/mmu_context.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,108 @@ +#ifndef __I386_SCHED_H +#define __I386_SCHED_H @@ -82569,7 +82592,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/mmu_context.h tmp +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/page.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/page.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/page.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/page.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/page.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,235 @@ +#ifndef _I386_PAGE_H +#define _I386_PAGE_H @@ -82808,7 +82831,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/page.h tmp-linux- +#endif /* _I386_PAGE_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/param.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/param.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/param.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/param.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/param.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,23 @@ +#ifndef _ASMi386_PARAM_H +#define _ASMi386_PARAM_H @@ -82835,7 +82858,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/param.h tmp-linux +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pci.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pci.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pci.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pci.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pci.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,148 @@ +#ifndef __i386_PCI_H +#define __i386_PCI_H @@ -82987,7 +83010,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pci.h tmp-linux-2 +#endif /* __i386_PCI_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgalloc.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgalloc.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgalloc.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgalloc.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgalloc.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,59 @@ +#ifndef _I386_PGALLOC_H +#define _I386_PGALLOC_H @@ -83050,7 +83073,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgalloc.h tmp-lin +#endif /* _I386_PGALLOC_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,20 @@ +#ifndef _I386_PGTABLE_2LEVEL_DEFS_H +#define _I386_PGTABLE_2LEVEL_DEFS_H @@ -83074,8 +83097,8 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-2level-de +#endif /* _I386_PGTABLE_2LEVEL_DEFS_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-2level.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-2level.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-2level.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-2level.h 2007-10-11 00:15:26.000000000 -0700 -@@ -0,0 +1,120 @@ ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-2level.h 2007-11-14 15:35:27.000000000 -0800 +@@ -0,0 +1,119 @@ +#ifndef _I386_PGTABLE_2LEVEL_H +#define _I386_PGTABLE_2LEVEL_H + @@ -83122,10 +83145,9 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-2level.h +{ + pte_t pte = *ptep; + if (!pte_none(pte)) { -+ if (mm != &init_mm) ++ if ((mm != &init_mm) || ++ HYPERVISOR_update_va_mapping(addr, __pte(0), 0)) + pte = __pte_ma(xchg(&ptep->pte_low, 0)); -+ else -+ HYPERVISOR_update_va_mapping(addr, __pte(0), 0); + } + return pte; +} @@ -83198,7 +83220,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-2level.h +#endif /* _I386_PGTABLE_2LEVEL_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,24 @@ +#ifndef _I386_PGTABLE_3LEVEL_DEFS_H +#define _I386_PGTABLE_3LEVEL_DEFS_H @@ -83226,7 +83248,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level-de +#endif /* _I386_PGTABLE_3LEVEL_DEFS_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-3level.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-3level.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable-3level.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,209 @@ +#ifndef _I386_PGTABLE_3LEVEL_H +#define _I386_PGTABLE_3LEVEL_H @@ -83358,7 +83380,8 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level.h +{ + pte_t pte = *ptep; + if (!pte_none(pte)) { -+ if (mm != &init_mm) { ++ if ((mm != &init_mm) || ++ HYPERVISOR_update_va_mapping(addr, __pte(0), 0)) { + uint64_t val = __pte_val(pte); + if (__cmpxchg64(ptep, val, 0) != val) { + /* xchg acts as a barrier before the setting of the high bits */ @@ -83366,8 +83389,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level.h + pte.pte_high = ptep->pte_high; + ptep->pte_high = 0; + } -+ } else -+ HYPERVISOR_update_va_mapping(addr, __pte(0), 0); ++ } + } + return pte; +} @@ -83439,7 +83461,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable-3level.h +#endif /* _I386_PGTABLE_3LEVEL_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/pgtable.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,531 @@ +#ifndef _I386_PGTABLE_H +#define _I386_PGTABLE_H @@ -83974,7 +83996,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/pgtable.h tmp-lin +#endif /* _I386_PGTABLE_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/processor.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/processor.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/processor.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/processor.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/processor.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,741 @@ +/* + * include/asm-i386/processor.h @@ -84719,7 +84741,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/processor.h tmp-l +#endif /* __ASM_I386_PROCESSOR_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/ptrace.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/ptrace.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/ptrace.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/ptrace.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/ptrace.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,90 @@ +#ifndef _I386_PTRACE_H +#define _I386_PTRACE_H @@ -84813,7 +84835,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/ptrace.h tmp-linu +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/scatterlist.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/scatterlist.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/scatterlist.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/scatterlist.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/scatterlist.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,22 @@ +#ifndef _I386_SCATTERLIST_H +#define _I386_SCATTERLIST_H @@ -84839,7 +84861,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/scatterlist.h tmp +#endif /* !(_I386_SCATTERLIST_H) */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/segment.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/segment.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/segment.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/segment.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/segment.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,117 @@ +#ifndef _ASM_SEGMENT_H +#define _ASM_SEGMENT_H @@ -84960,7 +84982,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/segment.h tmp-lin +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/setup.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/setup.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/setup.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/setup.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/setup.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,81 @@ +/* + * Just a place holder. We don't want to have to test x86 before @@ -85045,7 +85067,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/setup.h tmp-linux +#endif /* _i386_SETUP_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/smp.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/smp.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/smp.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/smp.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/smp.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,103 @@ +#ifndef __ASM_SMP_H +#define __ASM_SMP_H @@ -85152,7 +85174,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/smp.h tmp-linux-2 +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/spinlock.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/spinlock.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/spinlock.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/spinlock.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/spinlock.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,202 @@ +#ifndef __ASM_SPINLOCK_H +#define __ASM_SPINLOCK_H @@ -85358,7 +85380,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/spinlock.h tmp-li +#endif /* __ASM_SPINLOCK_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/swiotlb.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/swiotlb.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/swiotlb.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/swiotlb.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/swiotlb.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,43 @@ +#ifndef _ASM_SWIOTLB_H +#define _ASM_SWIOTLB_H 1 @@ -85405,7 +85427,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/swiotlb.h tmp-lin +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/synch_bitops.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/synch_bitops.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/synch_bitops.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/synch_bitops.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/synch_bitops.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,145 @@ +#ifndef __XEN_SYNCH_BITOPS_H__ +#define __XEN_SYNCH_BITOPS_H__ @@ -85554,7 +85576,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/synch_bitops.h tm +#endif /* __XEN_SYNCH_BITOPS_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/system.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/system.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/system.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/system.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/system.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,488 @@ +#ifndef __ASM_SYSTEM_H +#define __ASM_SYSTEM_H @@ -86046,7 +86068,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/system.h tmp-linu +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/tlbflush.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/tlbflush.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/tlbflush.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/tlbflush.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/tlbflush.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,101 @@ +#ifndef _I386_TLBFLUSH_H +#define _I386_TLBFLUSH_H @@ -86151,7 +86173,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/tlbflush.h tmp-li +#endif /* _I386_TLBFLUSH_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/vga.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/vga.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/vga.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/vga.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/vga.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,20 @@ +/* + * Access to VGA videoram @@ -86175,7 +86197,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/vga.h tmp-linux-2 +#endif diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/xenoprof.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/xenoprof.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/xenoprof.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/xenoprof.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/asm/xenoprof.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,48 @@ +/****************************************************************************** + * asm-i386/mach-xen/asm/xenoprof.h @@ -86227,7 +86249,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/asm/xenoprof.h tmp-li +#endif /* __ASM_XENOPROF_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/irq_vectors.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/irq_vectors.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/irq_vectors.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/irq_vectors.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/irq_vectors.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,125 @@ +/* + * This file should contain #defines for all of the interrupt vector @@ -86356,7 +86378,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/irq_vectors.h tmp-lin +#endif /* _ASM_IRQ_VECTORS_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/mach_traps.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/mach_traps.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/mach_traps.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/mach_traps.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/mach_traps.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,33 @@ +/* + * include/asm-xen/asm-i386/mach-xen/mach_traps.h @@ -86393,7 +86415,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/mach_traps.h tmp-linu +#endif /* !_MACH_TRAPS_H */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/setup_arch.h tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/setup_arch.h --- pristine-linux-2.6.18/include/asm-i386/mach-xen/setup_arch.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/setup_arch.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/mach-xen/setup_arch.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,5 @@ +/* Hook to call BIOS initialisation function */ + @@ -86402,7 +86424,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/mach-xen/setup_arch.h tmp-linu +void __init machine_specific_arch_setup(void); diff -Nurp pristine-linux-2.6.18/include/asm-i386/page.h tmp-linux-2.6-xen.patch/include/asm-i386/page.h --- pristine-linux-2.6.18/include/asm-i386/page.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/page.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/page.h 2007-11-16 16:18:13.000000000 -0800 @@ -122,7 +122,7 @@ extern int page_is_ram(unsigned long pag #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) @@ -86414,7 +86436,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/page.h tmp-linux-2.6-xen.patch #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) diff -Nurp pristine-linux-2.6.18/include/asm-i386/pgtable-2level-defs.h tmp-linux-2.6-xen.patch/include/asm-i386/pgtable-2level-defs.h --- pristine-linux-2.6.18/include/asm-i386/pgtable-2level-defs.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/pgtable-2level-defs.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/pgtable-2level-defs.h 2007-11-16 16:18:12.000000000 -0800 @@ -1,6 +1,8 @@ #ifndef _I386_PGTABLE_2LEVEL_DEFS_H #define _I386_PGTABLE_2LEVEL_DEFS_H @@ -86426,7 +86448,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/pgtable-2level-defs.h tmp-linu */ diff -Nurp pristine-linux-2.6.18/include/asm-i386/pgtable-3level-defs.h tmp-linux-2.6-xen.patch/include/asm-i386/pgtable-3level-defs.h --- pristine-linux-2.6.18/include/asm-i386/pgtable-3level-defs.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-i386/pgtable-3level-defs.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-i386/pgtable-3level-defs.h 2007-11-16 16:18:12.000000000 -0800 @@ -1,6 +1,8 @@ #ifndef _I386_PGTABLE_3LEVEL_DEFS_H #define _I386_PGTABLE_3LEVEL_DEFS_H @@ -86438,7 +86460,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-i386/pgtable-3level-defs.h tmp-linu */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/agp.h tmp-linux-2.6-xen.patch/include/asm-ia64/agp.h --- pristine-linux-2.6.18/include/asm-ia64/agp.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/agp.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/agp.h 2007-11-14 15:35:27.000000000 -0800 @@ -19,13 +19,44 @@ #define flush_agp_cache() mb() @@ -86486,7 +86508,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/agp.h tmp-linux-2.6-xen.patch/ #endif /* _ASM_IA64_AGP_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/dma-mapping.h tmp-linux-2.6-xen.patch/include/asm-ia64/dma-mapping.h --- pristine-linux-2.6.18/include/asm-ia64/dma-mapping.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/dma-mapping.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/dma-mapping.h 2007-11-14 15:35:27.000000000 -0800 @@ -6,7 +6,14 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ @@ -86589,13 +86611,13 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/dma-mapping.h tmp-linux-2.6-xe #endif /* _ASM_IA64_DMA_MAPPING_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/fixmap.h tmp-linux-2.6-xen.patch/include/asm-ia64/fixmap.h --- pristine-linux-2.6.18/include/asm-ia64/fixmap.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/fixmap.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/fixmap.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ +#define clear_fixmap(x) do {} while (0) +#define set_fixmap(x,y) do {} while (0) diff -Nurp pristine-linux-2.6.18/include/asm-ia64/gcc_intrin.h tmp-linux-2.6-xen.patch/include/asm-ia64/gcc_intrin.h --- pristine-linux-2.6.18/include/asm-ia64/gcc_intrin.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/gcc_intrin.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/gcc_intrin.h 2007-11-14 15:35:27.000000000 -0800 @@ -26,7 +26,7 @@ extern void ia64_bad_param_for_getreg (v register unsigned long ia64_r13 asm ("r13") __attribute_used__; @@ -86787,7 +86809,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/gcc_intrin.h tmp-linux-2.6-xen #endif /* _ASM_IA64_GCC_INTRIN_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/hw_irq.h tmp-linux-2.6-xen.patch/include/asm-ia64/hw_irq.h --- pristine-linux-2.6.18/include/asm-ia64/hw_irq.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/hw_irq.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/hw_irq.h 2007-11-14 15:35:27.000000000 -0800 @@ -15,7 +15,11 @@ #include <asm/ptrace.h> #include <asm/smp.h> @@ -86815,7 +86837,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/hw_irq.h tmp-linux-2.6-xen.pat diff -Nurp pristine-linux-2.6.18/include/asm-ia64/hypercall.h tmp-linux-2.6-xen.patch/include/asm-ia64/hypercall.h --- pristine-linux-2.6.18/include/asm-ia64/hypercall.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/hypercall.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/hypercall.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,425 @@ +/****************************************************************************** + * hypercall.h @@ -87244,7 +87266,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/hypercall.h tmp-linux-2.6-xen. +#endif /* __HYPERCALL_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/hypervisor.h tmp-linux-2.6-xen.patch/include/asm-ia64/hypervisor.h --- pristine-linux-2.6.18/include/asm-ia64/hypervisor.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/hypervisor.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/hypervisor.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,226 @@ +/****************************************************************************** + * hypervisor.h @@ -87474,7 +87496,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/hypervisor.h tmp-linux-2.6-xen +#endif /* __HYPERVISOR_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/intel_intrin.h tmp-linux-2.6-xen.patch/include/asm-ia64/intel_intrin.h --- pristine-linux-2.6.18/include/asm-ia64/intel_intrin.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/intel_intrin.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/intel_intrin.h 2007-11-14 15:35:27.000000000 -0800 @@ -16,8 +16,8 @@ * intrinsic */ @@ -87598,7 +87620,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/intel_intrin.h tmp-linux-2.6-x #endif /* _ASM_IA64_INTEL_INTRIN_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/io.h tmp-linux-2.6-xen.patch/include/asm-ia64/io.h --- pristine-linux-2.6.18/include/asm-ia64/io.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/io.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/io.h 2007-11-14 15:35:27.000000000 -0800 @@ -66,9 +66,11 @@ extern unsigned int num_io_spaces; #define PIO_RESERVED __IA64_UNCACHED_OFFSET #define HAVE_ARCH_PIO_SIZE @@ -87658,7 +87680,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/io.h tmp-linux-2.6-xen.patch/i diff -Nurp pristine-linux-2.6.18/include/asm-ia64/iosapic.h tmp-linux-2.6-xen.patch/include/asm-ia64/iosapic.h --- pristine-linux-2.6.18/include/asm-ia64/iosapic.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/iosapic.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/iosapic.h 2007-11-14 15:35:27.000000000 -0800 @@ -53,6 +53,7 @@ #define NR_IOSAPICS 256 @@ -87677,7 +87699,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/iosapic.h tmp-linux-2.6-xen.pa { diff -Nurp pristine-linux-2.6.18/include/asm-ia64/irq.h tmp-linux-2.6-xen.patch/include/asm-ia64/irq.h --- pristine-linux-2.6.18/include/asm-ia64/irq.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/irq.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/irq.h 2007-11-14 15:35:27.000000000 -0800 @@ -11,8 +11,41 @@ * 02/29/00 D.Mosberger moved most things into hw_irq.h */ @@ -87722,7 +87744,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/irq.h tmp-linux-2.6-xen.patch/ irq_canonicalize (int irq) diff -Nurp pristine-linux-2.6.18/include/asm-ia64/machvec_dig.h tmp-linux-2.6-xen.patch/include/asm-ia64/machvec_dig.h --- pristine-linux-2.6.18/include/asm-ia64/machvec_dig.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/machvec_dig.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/machvec_dig.h 2007-11-14 15:35:27.000000000 -0800 @@ -13,4 +13,19 @@ extern ia64_mv_setup_t dig_setup; #define platform_name "dig" #define platform_setup dig_setup @@ -87745,7 +87767,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/machvec_dig.h tmp-linux-2.6-xe #endif /* _ASM_IA64_MACHVEC_DIG_h */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/maddr.h tmp-linux-2.6-xen.patch/include/asm-ia64/maddr.h --- pristine-linux-2.6.18/include/asm-ia64/maddr.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/maddr.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/maddr.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,98 @@ +#ifndef _ASM_IA64_MADDR_H +#define _ASM_IA64_MADDR_H @@ -87847,7 +87869,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/maddr.h tmp-linux-2.6-xen.patc +#endif /* _ASM_IA64_MADDR_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/meminit.h tmp-linux-2.6-xen.patch/include/asm-ia64/meminit.h --- pristine-linux-2.6.18/include/asm-ia64/meminit.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/meminit.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/meminit.h 2007-11-14 15:35:27.000000000 -0800 @@ -16,10 +16,15 @@ * - command line string * - kernel code & data @@ -87866,7 +87888,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/meminit.h tmp-linux-2.6-xen.pa unsigned long start; /* virtual address of beginning of element */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/page.h tmp-linux-2.6-xen.patch/include/asm-ia64/page.h --- pristine-linux-2.6.18/include/asm-ia64/page.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/page.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/page.h 2007-11-14 15:35:27.000000000 -0800 @@ -119,6 +119,7 @@ extern struct page *vmem_map; #endif @@ -87913,7 +87935,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/page.h tmp-linux-2.6-xen.patch #endif /* _ASM_IA64_PAGE_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/pal.h tmp-linux-2.6-xen.patch/include/asm-ia64/pal.h --- pristine-linux-2.6.18/include/asm-ia64/pal.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/pal.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/pal.h 2007-11-14 15:35:27.000000000 -0800 @@ -82,6 +82,7 @@ #ifndef __ASSEMBLY__ @@ -87924,7 +87946,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/pal.h tmp-linux-2.6-xen.patch/ /* diff -Nurp pristine-linux-2.6.18/include/asm-ia64/pgalloc.h tmp-linux-2.6-xen.patch/include/asm-ia64/pgalloc.h --- pristine-linux-2.6.18/include/asm-ia64/pgalloc.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/pgalloc.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/pgalloc.h 2007-11-14 15:35:27.000000000 -0800 @@ -125,7 +125,11 @@ static inline void pmd_free(pmd_t * pmd) static inline void pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte) @@ -87939,7 +87961,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/pgalloc.h tmp-linux-2.6-xen.pa static inline void diff -Nurp pristine-linux-2.6.18/include/asm-ia64/privop.h tmp-linux-2.6-xen.patch/include/asm-ia64/privop.h --- pristine-linux-2.6.18/include/asm-ia64/privop.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/privop.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/privop.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,60 @@ +#ifndef _ASM_IA64_PRIVOP_H +#define _ASM_IA64_PRIVOP_H @@ -88003,7 +88025,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/privop.h tmp-linux-2.6-xen.pat +#endif /* _ASM_IA64_PRIVOP_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/processor.h tmp-linux-2.6-xen.patch/include/asm-ia64/processor.h --- pristine-linux-2.6.18/include/asm-ia64/processor.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/processor.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/processor.h 2007-11-14 15:35:27.000000000 -0800 @@ -18,6 +18,7 @@ #include <asm/kregs.h> #include <asm/ptrace.h> @@ -88014,7 +88036,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/processor.h tmp-linux-2.6-xen. /* diff -Nurp pristine-linux-2.6.18/include/asm-ia64/sal.h tmp-linux-2.6-xen.patch/include/asm-ia64/sal.h --- pristine-linux-2.6.18/include/asm-ia64/sal.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/sal.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/sal.h 2007-11-14 15:35:27.000000000 -0800 @@ -42,6 +42,9 @@ #include <asm/pal.h> #include <asm/system.h> @@ -88056,7 +88078,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/sal.h tmp-linux-2.6-xen.patch/ if (isrv.status) diff -Nurp pristine-linux-2.6.18/include/asm-ia64/swiotlb.h tmp-linux-2.6-xen.patch/include/asm-ia64/swiotlb.h --- pristine-linux-2.6.18/include/asm-ia64/swiotlb.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/swiotlb.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/swiotlb.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,41 @@ +#ifndef _ASM_SWIOTLB_H +#define _ASM_SWIOTLB_H 1 @@ -88101,7 +88123,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/swiotlb.h tmp-linux-2.6-xen.pa +#endif diff -Nurp pristine-linux-2.6.18/include/asm-ia64/synch_bitops.h tmp-linux-2.6-xen.patch/include/asm-ia64/synch_bitops.h --- pristine-linux-2.6.18/include/asm-ia64/synch_bitops.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/synch_bitops.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/synch_bitops.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,61 @@ +#ifndef __XEN_SYNCH_BITOPS_H__ +#define __XEN_SYNCH_BITOPS_H__ @@ -88166,7 +88188,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/synch_bitops.h tmp-linux-2.6-x +#endif /* __XEN_SYNCH_BITOPS_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/system.h tmp-linux-2.6-xen.patch/include/asm-ia64/system.h --- pristine-linux-2.6.18/include/asm-ia64/system.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/system.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/system.h 2007-11-14 15:35:27.000000000 -0800 @@ -123,7 +123,7 @@ extern struct ia64_boot_param { #define __local_irq_save(x) \ do { \ @@ -88187,7 +88209,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/system.h tmp-linux-2.6-xen.pat ({ \ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/uaccess.h tmp-linux-2.6-xen.patch/include/asm-ia64/uaccess.h --- pristine-linux-2.6.18/include/asm-ia64/uaccess.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/uaccess.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/uaccess.h 2007-11-14 15:35:27.000000000 -0800 @@ -365,6 +365,7 @@ ia64_done_with_exception (struct pt_regs } @@ -88224,7 +88246,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/uaccess.h tmp-linux-2.6-xen.pa * Convert a virtual cached kernel memory pointer to an uncached pointer diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xen/privop.h tmp-linux-2.6-xen.patch/include/asm-ia64/xen/privop.h --- pristine-linux-2.6.18/include/asm-ia64/xen/privop.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/xen/privop.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/xen/privop.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,310 @@ +#ifndef _ASM_IA64_XEN_PRIVOP_H +#define _ASM_IA64_XEN_PRIVOP_H @@ -88538,7 +88560,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xen/privop.h tmp-linux-2.6-xen +#endif /* _ASM_IA64_XEN_PRIVOP_H */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xen/xcom_hcall.h tmp-linux-2.6-xen.patch/include/asm-ia64/xen/xcom_hcall.h --- pristine-linux-2.6.18/include/asm-ia64/xen/xcom_hcall.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/xen/xcom_hcall.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/xen/xcom_hcall.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2006 Tristan Gingold <tristan.gingold@bull.net>, Bull SAS @@ -88630,7 +88652,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xen/xcom_hcall.h tmp-linux-2.6 +#endif /* _LINUX_XENCOMM_HCALL_H_ */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xen/xencomm.h tmp-linux-2.6-xen.patch/include/asm-ia64/xen/xencomm.h --- pristine-linux-2.6.18/include/asm-ia64/xen/xencomm.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/xen/xencomm.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/xen/xencomm.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2006 Hollis Blanchard <hollisb@us.ibm.com>, IBM Corporation @@ -88694,7 +88716,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xen/xencomm.h tmp-linux-2.6-xe +#endif /* _LINUX_XENCOMM_H_ */ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xenoprof.h tmp-linux-2.6-xen.patch/include/asm-ia64/xenoprof.h --- pristine-linux-2.6.18/include/asm-ia64/xenoprof.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-ia64/xenoprof.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-ia64/xenoprof.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,48 @@ +/****************************************************************************** + * asm-ia64/xenoprof.h @@ -88746,7 +88768,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-ia64/xenoprof.h tmp-linux-2.6-xen.p +#endif /* __ASM_XENOPROF_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-um/page.h tmp-linux-2.6-xen.patch/include/asm-um/page.h --- pristine-linux-2.6.18/include/asm-um/page.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-um/page.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-um/page.h 2007-11-14 15:35:27.000000000 -0800 @@ -114,7 +114,7 @@ extern unsigned long uml_physmem; extern struct page *arch_validate(struct page *page, gfp_t mask, int order); #define HAVE_ARCH_VALIDATE @@ -88758,7 +88780,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-um/page.h tmp-linux-2.6-xen.patch/i #include <asm-generic/memory_model.h> diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/apic.h tmp-linux-2.6-xen.patch/include/asm-x86_64/apic.h --- pristine-linux-2.6.18/include/asm-x86_64/apic.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/apic.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/apic.h 2007-11-14 15:35:27.000000000 -0800 @@ -98,11 +98,13 @@ extern void setup_APIC_extened_lvt(unsig extern int disable_timer_pin_1; @@ -88775,7 +88797,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/apic.h tmp-linux-2.6-xen.pat diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/kexec.h tmp-linux-2.6-xen.patch/include/asm-x86_64/kexec.h --- pristine-linux-2.6.18/include/asm-x86_64/kexec.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/kexec.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/kexec.h 2007-11-14 15:35:27.000000000 -0800 @@ -1,6 +1,27 @@ #ifndef _X86_64_KEXEC_H #define _X86_64_KEXEC_H @@ -88832,7 +88854,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/kexec.h tmp-linux-2.6-xen.pa #endif /* _X86_64_KEXEC_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/agp.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/agp.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/agp.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/agp.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/agp.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,35 @@ +#ifndef AGP_H +#define AGP_H 1 @@ -88871,7 +88893,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/agp.h tmp-linux +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/arch_hooks.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/arch_hooks.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/arch_hooks.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/arch_hooks.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/arch_hooks.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,27 @@ +#ifndef _ASM_ARCH_HOOKS_H +#define _ASM_ARCH_HOOKS_H @@ -88902,7 +88924,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/arch_hooks.h tm +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/bootsetup.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/bootsetup.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/bootsetup.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/bootsetup.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/bootsetup.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,42 @@ + +#ifndef _X86_64_BOOTSETUP_H @@ -88948,7 +88970,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/bootsetup.h tmp +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/desc.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/desc.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/desc.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/desc.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/desc.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,263 @@ +/* Written 2000 by Andi Kleen */ +#ifndef __ARCH_DESC_H @@ -89215,7 +89237,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/desc.h tmp-linu +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/dma-mapping.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/dma-mapping.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/dma-mapping.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/dma-mapping.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/dma-mapping.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,207 @@ +#ifndef _X8664_DMA_MAPPING_H +#define _X8664_DMA_MAPPING_H 1 @@ -89426,7 +89448,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/dma-mapping.h t +#include <asm-i386/mach-xen/asm/dma-mapping.h> diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/e820.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/e820.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/e820.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/e820.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/e820.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,66 @@ +/* + * structures and definitions for the int 15, ax=e820 memory map @@ -89496,7 +89518,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/e820.h tmp-linu +#endif/*__E820_HEADER*/ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/fixmap.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/fixmap.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/fixmap.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/fixmap.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/fixmap.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,112 @@ +/* + * fixmap.h: compile-time virtual memory allocation @@ -89612,7 +89634,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/fixmap.h tmp-li +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/floppy.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/floppy.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/floppy.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/floppy.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/floppy.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,206 @@ +/* + * Architecture specific parts of the Floppy driver @@ -89822,7 +89844,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/floppy.h tmp-li +#endif /* __ASM_XEN_X86_64_FLOPPY_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hw_irq.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hw_irq.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hw_irq.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hw_irq.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hw_irq.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,136 @@ +#ifndef _ASM_HW_IRQ_H +#define _ASM_HW_IRQ_H @@ -89962,7 +89984,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hw_irq.h tmp-li +#endif /* _ASM_HW_IRQ_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hypercall.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hypercall.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hypercall.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hypercall.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hypercall.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,406 @@ +/****************************************************************************** + * hypercall.h @@ -90372,13 +90394,13 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hypercall.h tmp +#endif /* __HYPERCALL_H__ */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hypervisor.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hypervisor.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/hypervisor.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hypervisor.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/hypervisor.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +#include <asm-i386/mach-xen/asm/hypervisor.h> diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/io.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/io.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/io.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/io.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/io.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,330 @@ +#ifndef _ASM_IO_H +#define _ASM_IO_H @@ -90712,7 +90734,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/io.h tmp-linux- +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/irq.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/irq.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/irq.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/irq.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/irq.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,38 @@ +#ifndef _ASM_IRQ_H +#define _ASM_IRQ_H @@ -90754,7 +90776,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/irq.h tmp-linux +#endif /* _ASM_IRQ_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/irqflags.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/irqflags.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/irqflags.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/irqflags.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/irqflags.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,139 @@ +/* + * include/asm-x86_64/irqflags.h @@ -90897,7 +90919,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/irqflags.h tmp- +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/maddr.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/maddr.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/maddr.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/maddr.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/maddr.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,161 @@ +#ifndef _X86_64_MADDR_H +#define _X86_64_MADDR_H @@ -91062,7 +91084,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/maddr.h tmp-lin + diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/mmu.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/mmu.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/mmu.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/mmu.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/mmu.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,38 @@ +#ifndef __x86_64_MMU_H +#define __x86_64_MMU_H @@ -91104,7 +91126,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/mmu.h tmp-linux +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/mmu_context.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/mmu_context.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/mmu_context.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/mmu_context.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/mmu_context.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,136 @@ +#ifndef __X86_64_MMU_CONTEXT_H +#define __X86_64_MMU_CONTEXT_H @@ -91244,7 +91266,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/mmu_context.h t +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/msr.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/msr.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/msr.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/msr.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/msr.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,399 @@ +#ifndef X86_64_MSR_H +#define X86_64_MSR_H 1 @@ -91647,7 +91669,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/msr.h tmp-linux +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/nmi.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/nmi.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/nmi.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/nmi.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/nmi.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,93 @@ +/* + * linux/include/asm-i386/nmi.h @@ -91744,7 +91766,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/nmi.h tmp-linux +#endif /* ASM_NMI_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/page.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/page.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/page.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/page.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/page.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,217 @@ +#ifndef _X86_64_PAGE_H +#define _X86_64_PAGE_H @@ -91965,7 +91987,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/page.h tmp-linu +#endif /* _X86_64_PAGE_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pci.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pci.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pci.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pci.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pci.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,168 @@ +#ifndef __x8664_PCI_H +#define __x8664_PCI_H @@ -92137,7 +92159,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pci.h tmp-linux +#endif /* __x8664_PCI_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pgalloc.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pgalloc.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pgalloc.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pgalloc.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pgalloc.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,204 @@ +#ifndef _X86_64_PGALLOC_H +#define _X86_64_PGALLOC_H @@ -92345,8 +92367,8 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pgalloc.h tmp-l +#endif /* _X86_64_PGALLOC_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pgtable.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pgtable.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pgtable.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pgtable.h 2007-10-11 00:15:26.000000000 -0700 -@@ -0,0 +1,575 @@ ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/pgtable.h 2007-11-14 15:35:27.000000000 -0800 +@@ -0,0 +1,574 @@ +#ifndef _X86_64_PGTABLE_H +#define _X86_64_PGTABLE_H + @@ -92635,10 +92657,9 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pgtable.h tmp-l +{ + pte_t pte = *ptep; + if (!pte_none(pte)) { -+ if (mm != &init_mm) ++ if ((mm != &init_mm) || ++ HYPERVISOR_update_va_mapping(addr, __pte(0), 0)) + pte = __pte_ma(xchg(&ptep->pte, 0)); -+ else -+ HYPERVISOR_update_va_mapping(addr, __pte(0), 0); + } + return pte; +} @@ -92924,7 +92945,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/pgtable.h tmp-l +#endif /* _X86_64_PGTABLE_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/processor.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/processor.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/processor.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/processor.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/processor.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,506 @@ +/* + * include/asm-x86_64/processor.h @@ -93434,7 +93455,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/processor.h tmp +#endif /* __ASM_X86_64_PROCESSOR_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/ptrace.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/ptrace.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/ptrace.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/ptrace.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/ptrace.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,127 @@ +#ifndef _X86_64_PTRACE_H +#define _X86_64_PTRACE_H @@ -93565,7 +93586,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/ptrace.h tmp-li +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/smp.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/smp.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/smp.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/smp.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/smp.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,150 @@ +#ifndef __ASM_SMP_H +#define __ASM_SMP_H @@ -93719,13 +93740,13 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/smp.h tmp-linux + diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/synch_bitops.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/synch_bitops.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/synch_bitops.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/synch_bitops.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/synch_bitops.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,2 @@ + +#include <asm-i386/mach-xen/asm/synch_bitops.h> diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/system.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/system.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/system.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/system.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/system.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,262 @@ +#ifndef __ASM_SYSTEM_H +#define __ASM_SYSTEM_H @@ -93991,7 +94012,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/system.h tmp-li +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/timer.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/timer.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/timer.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/timer.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/timer.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,67 @@ +#ifndef _ASMi386_TIMER_H +#define _ASMi386_TIMER_H @@ -94062,7 +94083,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/timer.h tmp-lin +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/tlbflush.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/tlbflush.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/tlbflush.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/tlbflush.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/tlbflush.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,103 @@ +#ifndef _X8664_TLBFLUSH_H +#define _X8664_TLBFLUSH_H @@ -94169,7 +94190,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/tlbflush.h tmp- +#endif /* _X8664_TLBFLUSH_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/vga.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/vga.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/vga.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/vga.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/vga.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,20 @@ +/* + * Access to VGA videoram @@ -94193,12 +94214,12 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/vga.h tmp-linux +#endif diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/xenoprof.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/xenoprof.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/xenoprof.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/xenoprof.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/xenoprof.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1 @@ +#include <asm-i386/mach-xen/asm/xenoprof.h> diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/xor.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/xor.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/xor.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/xor.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/asm/xor.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,328 @@ +/* + * x86-64 changes / gcc fixes from Andi Kleen. @@ -94530,7 +94551,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/asm/xor.h tmp-linux +#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse) diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/irq_vectors.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/irq_vectors.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/irq_vectors.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/irq_vectors.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/irq_vectors.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,123 @@ +/* + * This file should contain #defines for all of the interrupt vector @@ -94657,7 +94678,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/irq_vectors.h tmp-l +#endif /* _ASM_IRQ_VECTORS_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/mach_time.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/mach_time.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/mach_time.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/mach_time.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/mach_time.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,111 @@ +/* + * include/asm-i386/mach-default/mach_time.h @@ -94772,7 +94793,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/mach_time.h tmp-lin +#endif /* !_MACH_TIME_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/mach_timer.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/mach_timer.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/mach_timer.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/mach_timer.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/mach_timer.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,50 @@ +/* + * include/asm-i386/mach-default/mach_timer.h @@ -94826,7 +94847,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/mach_timer.h tmp-li +#endif /* !_MACH_TIMER_H */ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/setup_arch_post.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/setup_arch_post.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/setup_arch_post.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/setup_arch_post.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/setup_arch_post.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,63 @@ +/** + * machine_specific_* - Hooks for machine specific setup. @@ -94893,7 +94914,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/setup_arch_post.h t +} diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/setup_arch_pre.h tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/setup_arch_pre.h --- pristine-linux-2.6.18/include/asm-x86_64/mach-xen/setup_arch_pre.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/setup_arch_pre.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/asm-x86_64/mach-xen/setup_arch_pre.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,5 @@ +/* Hook to call BIOS initialisation function */ + @@ -94902,7 +94923,7 @@ diff -Nurp pristine-linux-2.6.18/include/asm-x86_64/mach-xen/setup_arch_pre.h tm +static void __init machine_specific_arch_setup(void); diff -Nurp pristine-linux-2.6.18/include/linux/aio.h tmp-linux-2.6-xen.patch/include/linux/aio.h --- pristine-linux-2.6.18/include/linux/aio.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/aio.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/aio.h 2007-11-16 16:18:12.000000000 -0800 @@ -191,6 +191,11 @@ struct kioctx { struct aio_ring_info ring_info; @@ -94917,7 +94938,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/aio.h tmp-linux-2.6-xen.patch/inc /* prototypes */ diff -Nurp pristine-linux-2.6.18/include/linux/crash_dump.h tmp-linux-2.6-xen.patch/include/linux/crash_dump.h --- pristine-linux-2.6.18/include/linux/crash_dump.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/crash_dump.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/crash_dump.h 2007-11-16 16:18:13.000000000 -0800 @@ -14,5 +14,13 @@ extern ssize_t copy_oldmem_page(unsigned extern const struct file_operations proc_vmcore_operations; extern struct proc_dir_entry *proc_vmcore; @@ -94934,7 +94955,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/crash_dump.h tmp-linux-2.6-xen.pa #endif /* LINUX_CRASHDUMP_H */ diff -Nurp pristine-linux-2.6.18/include/linux/elfnote.h tmp-linux-2.6-xen.patch/include/linux/elfnote.h --- pristine-linux-2.6.18/include/linux/elfnote.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/linux/elfnote.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/elfnote.h 2007-11-16 16:18:13.000000000 -0800 @@ -0,0 +1,104 @@ +#ifndef _LINUX_ELFNOTE_H +#define _LINUX_ELFNOTE_H @@ -95042,7 +95063,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/elfnote.h tmp-linux-2.6-xen.patch +#endif /* _LINUX_ELFNOTE_H */ diff -Nurp pristine-linux-2.6.18/include/linux/eventpoll.h tmp-linux-2.6-xen.patch/include/linux/eventpoll.h --- pristine-linux-2.6.18/include/linux/eventpoll.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/eventpoll.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/eventpoll.h 2007-11-16 16:18:12.000000000 -0800 @@ -90,6 +90,12 @@ static inline void eventpoll_release(str eventpoll_release_file(file); } @@ -95058,7 +95079,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/eventpoll.h tmp-linux-2.6-xen.pat static inline void eventpoll_init_file(struct file *file) {} diff -Nurp pristine-linux-2.6.18/include/linux/gfp.h tmp-linux-2.6-xen.patch/include/linux/gfp.h --- pristine-linux-2.6.18/include/linux/gfp.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/gfp.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/gfp.h 2007-11-14 15:35:27.000000000 -0800 @@ -99,7 +99,11 @@ static inline int gfp_zone(gfp_t gfp) */ @@ -95074,7 +95095,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/gfp.h tmp-linux-2.6-xen.patch/inc extern struct page * diff -Nurp pristine-linux-2.6.18/include/linux/highmem.h tmp-linux-2.6-xen.patch/include/linux/highmem.h --- pristine-linux-2.6.18/include/linux/highmem.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/highmem.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/highmem.h 2007-11-14 15:35:27.000000000 -0800 @@ -24,10 +24,16 @@ static inline void flush_kernel_dcache_p /* declarations for linux/mm/highmem.c */ @@ -95094,7 +95115,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/highmem.h tmp-linux-2.6-xen.patch { diff -Nurp pristine-linux-2.6.18/include/linux/interrupt.h tmp-linux-2.6-xen.patch/include/linux/interrupt.h --- pristine-linux-2.6.18/include/linux/interrupt.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/interrupt.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/interrupt.h 2007-11-14 15:35:27.000000000 -0800 @@ -166,6 +166,12 @@ static inline int disable_irq_wake(unsig #endif /* CONFIG_GENERIC_HARDIRQS */ @@ -95110,7 +95131,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/interrupt.h tmp-linux-2.6-xen.pat #define or_softirq_pending(x) (local_softirq_pending() |= (x)) diff -Nurp pristine-linux-2.6.18/include/linux/kexec.h tmp-linux-2.6-xen.patch/include/linux/kexec.h --- pristine-linux-2.6.18/include/linux/kexec.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/kexec.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/kexec.h 2007-11-14 15:35:27.000000000 -0800 @@ -31,6 +31,13 @@ #error KEXEC_ARCH not defined #endif @@ -95140,7 +95161,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/kexec.h tmp-linux-2.6-xen.patch/i struct kexec_segment __user *segments, diff -Nurp pristine-linux-2.6.18/include/linux/mm.h tmp-linux-2.6-xen.patch/include/linux/mm.h --- pristine-linux-2.6.18/include/linux/mm.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/mm.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/mm.h 2007-11-14 15:35:27.000000000 -0800 @@ -164,6 +164,9 @@ extern unsigned int kobjsize(const void #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ #define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */ @@ -95178,7 +95199,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/mm.h tmp-linux-2.6-xen.patch/incl #else diff -Nurp pristine-linux-2.6.18/include/linux/oprofile.h tmp-linux-2.6-xen.patch/include/linux/oprofile.h --- pristine-linux-2.6.18/include/linux/oprofile.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/oprofile.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/oprofile.h 2007-11-16 16:18:13.000000000 -0800 @@ -16,6 +16,8 @@ #include <linux/types.h> #include <linux/spinlock.h> @@ -95211,7 +95232,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/oprofile.h tmp-linux-2.6-xen.patc * Create a file of the given name as a child of the given root, with diff -Nurp pristine-linux-2.6.18/include/linux/page-flags.h tmp-linux-2.6-xen.patch/include/linux/page-flags.h --- pristine-linux-2.6.18/include/linux/page-flags.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/page-flags.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/page-flags.h 2007-11-14 15:35:27.000000000 -0800 @@ -98,6 +98,8 @@ #define PG_uncached 31 /* Page has been mapped as uncached */ #endif @@ -95242,7 +95263,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/page-flags.h tmp-linux-2.6-xen.pa int test_clear_page_dirty(struct page *page); diff -Nurp pristine-linux-2.6.18/include/linux/sched.h tmp-linux-2.6-xen.patch/include/linux/sched.h --- pristine-linux-2.6.18/include/linux/sched.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/sched.h 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/sched.h 2007-11-16 16:18:13.000000000 -0800 @@ -211,10 +211,15 @@ extern void update_process_times(int use extern void scheduler_tick(void); @@ -95261,7 +95282,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/sched.h tmp-linux-2.6-xen.patch/i } diff -Nurp pristine-linux-2.6.18/include/linux/skbuff.h tmp-linux-2.6-xen.patch/include/linux/skbuff.h --- pristine-linux-2.6.18/include/linux/skbuff.h 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/include/linux/skbuff.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/linux/skbuff.h 2007-11-14 15:35:27.000000000 -0800 @@ -203,6 +203,8 @@ enum { * @local_df: allow local fragmentation * @cloned: Head may be cloned (check refcnt to be sure) @@ -95287,7 +95308,7 @@ diff -Nurp pristine-linux-2.6.18/include/linux/skbuff.h tmp-linux-2.6-xen.patch/ void (*destructor)(struct sk_buff *skb); diff -Nurp pristine-linux-2.6.18/include/xen/balloon.h tmp-linux-2.6-xen.patch/include/xen/balloon.h --- pristine-linux-2.6.18/include/xen/balloon.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/balloon.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/balloon.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,57 @@ +/****************************************************************************** + * balloon.h @@ -95348,8 +95369,8 @@ diff -Nurp pristine-linux-2.6.18/include/xen/balloon.h tmp-linux-2.6-xen.patch/i +#endif /* __ASM_BALLOON_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/blkif.h tmp-linux-2.6-xen.patch/include/xen/blkif.h --- pristine-linux-2.6.18/include/xen/blkif.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/blkif.h 2007-10-11 00:15:26.000000000 -0700 -@@ -0,0 +1,97 @@ ++++ tmp-linux-2.6-xen.patch/include/xen/blkif.h 2007-11-14 15:35:27.000000000 -0800 +@@ -0,0 +1,101 @@ +#ifndef __XEN_BLKIF_H__ +#define __XEN_BLKIF_H__ + @@ -95424,32 +95445,36 @@ diff -Nurp pristine-linux-2.6.18/include/xen/blkif.h tmp-linux-2.6-xen.patch/inc + +static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_request_t *src) +{ -+ int i; ++ int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; + dst->operation = src->operation; + dst->nr_segments = src->nr_segments; + dst->handle = src->handle; + dst->id = src->id; + dst->sector_number = src->sector_number; -+ for (i = 0; i < src->nr_segments; i++) ++ if (n > src->nr_segments) ++ n = src->nr_segments; ++ for (i = 0; i < n; i++) + dst->seg[i] = src->seg[i]; +} + +static void inline blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_request_t *src) +{ -+ int i; ++ int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST; + dst->operation = src->operation; + dst->nr_segments = src->nr_segments; + dst->handle = src->handle; + dst->id = src->id; + dst->sector_number = src->sector_number; -+ for (i = 0; i < src->nr_segments; i++) ++ if (n > src->nr_segments) ++ n = src->nr_segments; ++ for (i = 0; i < n; i++) + dst->seg[i] = src->seg[i]; +} + +#endif /* __XEN_BLKIF_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/cpu_hotplug.h tmp-linux-2.6-xen.patch/include/xen/cpu_hotplug.h --- pristine-linux-2.6.18/include/xen/cpu_hotplug.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/cpu_hotplug.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/cpu_hotplug.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,41 @@ +#ifndef __XEN_CPU_HOTPLUG_H__ +#define __XEN_CPU_HOTPLUG_H__ @@ -95494,7 +95519,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/cpu_hotplug.h tmp-linux-2.6-xen.pat +#endif /* __XEN_CPU_HOTPLUG_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/driver_util.h tmp-linux-2.6-xen.patch/include/xen/driver_util.h --- pristine-linux-2.6.18/include/xen/driver_util.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/driver_util.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/driver_util.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,14 @@ + +#ifndef __ASM_XEN_DRIVER_UTIL_H__ @@ -95512,7 +95537,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/driver_util.h tmp-linux-2.6-xen.pat +#endif /* __ASM_XEN_DRIVER_UTIL_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/evtchn.h tmp-linux-2.6-xen.patch/include/xen/evtchn.h --- pristine-linux-2.6.18/include/xen/evtchn.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/evtchn.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/evtchn.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,126 @@ +/****************************************************************************** + * evtchn.h @@ -95642,7 +95667,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/evtchn.h tmp-linux-2.6-xen.patch/in +#endif /* __ASM_EVTCHN_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/features.h tmp-linux-2.6-xen.patch/include/xen/features.h --- pristine-linux-2.6.18/include/xen/features.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/features.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/features.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,20 @@ +/****************************************************************************** + * features.h @@ -95666,7 +95691,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/features.h tmp-linux-2.6-xen.patch/ +#endif /* __ASM_XEN_FEATURES_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/gnttab.h tmp-linux-2.6-xen.patch/include/xen/gnttab.h --- pristine-linux-2.6.18/include/xen/gnttab.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/gnttab.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/gnttab.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,138 @@ +/****************************************************************************** + * gnttab.h @@ -95808,7 +95833,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/gnttab.h tmp-linux-2.6-xen.patch/in +#endif /* __ASM_GNTTAB_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/hvm.h tmp-linux-2.6-xen.patch/include/xen/hvm.h --- pristine-linux-2.6.18/include/xen/hvm.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/hvm.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/hvm.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,23 @@ +/* Simple wrappers around HVM functions */ +#ifndef XEN_HVM_H__ @@ -95835,7 +95860,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/hvm.h tmp-linux-2.6-xen.patch/inclu +#endif /* XEN_HVM_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/hypercall.h tmp-linux-2.6-xen.patch/include/xen/hypercall.h --- pristine-linux-2.6.18/include/xen/hypercall.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/hypercall.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/hypercall.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,24 @@ +#ifndef __XEN_HYPERCALL_H__ +#define __XEN_HYPERCALL_H__ @@ -95863,7 +95888,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/hypercall.h tmp-linux-2.6-xen.patch +#endif /* __XEN_HYPERCALL_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/hypervisor_sysfs.h tmp-linux-2.6-xen.patch/include/xen/hypervisor_sysfs.h --- pristine-linux-2.6.18/include/xen/hypervisor_sysfs.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/hypervisor_sysfs.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/hypervisor_sysfs.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,30 @@ +/* + * copyright (c) 2006 IBM Corporation @@ -95897,7 +95922,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/hypervisor_sysfs.h tmp-linux-2.6-xe +#endif /* _HYP_SYSFS_H_ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/COPYING tmp-linux-2.6-xen.patch/include/xen/interface/COPYING --- pristine-linux-2.6.18/include/xen/interface/COPYING 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/COPYING 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/COPYING 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,38 @@ +XEN NOTICE +========== @@ -95939,7 +95964,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/COPYING tmp-linux-2.6-xen +DEALINGS IN THE SOFTWARE. diff -Nurp pristine-linux-2.6.18/include/xen/interface/acm.h tmp-linux-2.6-xen.patch/include/xen/interface/acm.h --- pristine-linux-2.6.18/include/xen/interface/acm.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/acm.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/acm.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,228 @@ +/* + * acm.h: Xen access control module interface defintions @@ -96171,7 +96196,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/acm.h tmp-linux-2.6-xen.p + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/acm_ops.h tmp-linux-2.6-xen.patch/include/xen/interface/acm_ops.h --- pristine-linux-2.6.18/include/xen/interface/acm_ops.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/acm_ops.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/acm_ops.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,159 @@ +/* + * acm_ops.h: Xen access control module hypervisor commands @@ -96334,7 +96359,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/acm_ops.h tmp-linux-2.6-x + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-ia64.h tmp-linux-2.6-xen.patch/include/xen/interface/arch-ia64.h --- pristine-linux-2.6.18/include/xen/interface/arch-ia64.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-ia64.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-ia64.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,522 @@ +/****************************************************************************** + * arch-ia64/hypervisor-if.h @@ -96860,7 +96885,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-ia64.h tmp-linux-2.6 + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-powerpc.h tmp-linux-2.6-xen.patch/include/xen/interface/arch-powerpc.h --- pristine-linux-2.6.18/include/xen/interface/arch-powerpc.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-powerpc.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-powerpc.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,125 @@ +/* + * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -96989,7 +97014,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-powerpc.h tmp-linux- +#endif diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86/xen-x86_32.h tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen-x86_32.h --- pristine-linux-2.6.18/include/xen/interface/arch-x86/xen-x86_32.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen-x86_32.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen-x86_32.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,184 @@ +/****************************************************************************** + * xen-x86_32.h @@ -97177,7 +97202,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86/xen-x86_32.h tmp + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86/xen-x86_64.h tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen-x86_64.h --- pristine-linux-2.6.18/include/xen/interface/arch-x86/xen-x86_64.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen-x86_64.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen-x86_64.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,211 @@ +/****************************************************************************** + * xen-x86_64.h @@ -97392,7 +97417,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86/xen-x86_64.h tmp + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86/xen.h tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen.h --- pristine-linux-2.6.18/include/xen/interface/arch-x86/xen.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86/xen.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,205 @@ +/****************************************************************************** + * arch-x86/xen.h @@ -97601,7 +97626,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86/xen.h tmp-linux- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86_32.h tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86_32.h --- pristine-linux-2.6.18/include/xen/interface/arch-x86_32.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86_32.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86_32.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,27 @@ +/****************************************************************************** + * arch-x86_32.h @@ -97632,7 +97657,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86_32.h tmp-linux-2 +#include "arch-x86/xen.h" diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86_64.h tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86_64.h --- pristine-linux-2.6.18/include/xen/interface/arch-x86_64.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86_64.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/arch-x86_64.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,27 @@ +/****************************************************************************** + * arch-x86_64.h @@ -97663,7 +97688,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/arch-x86_64.h tmp-linux-2 +#include "arch-x86/xen.h" diff -Nurp pristine-linux-2.6.18/include/xen/interface/callback.h tmp-linux-2.6-xen.patch/include/xen/interface/callback.h --- pristine-linux-2.6.18/include/xen/interface/callback.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/callback.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/callback.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,92 @@ +/****************************************************************************** + * callback.h @@ -97759,7 +97784,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/callback.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/dom0_ops.h tmp-linux-2.6-xen.patch/include/xen/interface/dom0_ops.h --- pristine-linux-2.6.18/include/xen/interface/dom0_ops.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/dom0_ops.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/dom0_ops.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,120 @@ +/****************************************************************************** + * dom0_ops.h @@ -97883,7 +97908,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/dom0_ops.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/domctl.h tmp-linux-2.6-xen.patch/include/xen/interface/domctl.h --- pristine-linux-2.6.18/include/xen/interface/domctl.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/domctl.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/domctl.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,481 @@ +/****************************************************************************** + * domctl.h @@ -98368,7 +98393,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/domctl.h tmp-linux-2.6-xe + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/elfnote.h tmp-linux-2.6-xen.patch/include/xen/interface/elfnote.h --- pristine-linux-2.6.18/include/xen/interface/elfnote.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/elfnote.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/elfnote.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,233 @@ +/****************************************************************************** + * elfnote.h @@ -98605,7 +98630,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/elfnote.h tmp-linux-2.6-x + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/elfstructs.h tmp-linux-2.6-xen.patch/include/xen/interface/elfstructs.h --- pristine-linux-2.6.18/include/xen/interface/elfstructs.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/elfstructs.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/elfstructs.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,527 @@ +#ifndef __XEN_PUBLIC_ELFSTRUCTS_H__ +#define __XEN_PUBLIC_ELFSTRUCTS_H__ 1 @@ -99136,7 +99161,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/elfstructs.h tmp-linux-2. +#endif /* __XEN_PUBLIC_ELFSTRUCTS_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/event_channel.h tmp-linux-2.6-xen.patch/include/xen/interface/event_channel.h --- pristine-linux-2.6.18/include/xen/interface/event_channel.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/event_channel.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/event_channel.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,264 @@ +/****************************************************************************** + * event_channel.h @@ -99404,7 +99429,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/event_channel.h tmp-linux + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/features.h tmp-linux-2.6-xen.patch/include/xen/interface/features.h --- pristine-linux-2.6.18/include/xen/interface/features.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/features.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/features.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,71 @@ +/****************************************************************************** + * features.h @@ -99479,7 +99504,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/features.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/Makefile tmp-linux-2.6-xen.patch/include/xen/interface/foreign/Makefile --- pristine-linux-2.6.18/include/xen/interface/foreign/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,37 @@ +XEN_ROOT=../../../.. +include $(XEN_ROOT)/Config.mk @@ -99520,7 +99545,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/Makefile tmp-linu + python mkchecker.py $(XEN_TARGET_ARCH) $@ $(architectures) diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/mkchecker.py tmp-linux-2.6-xen.patch/include/xen/interface/foreign/mkchecker.py --- pristine-linux-2.6.18/include/xen/interface/foreign/mkchecker.py 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/mkchecker.py 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/mkchecker.py 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,58 @@ +#!/usr/bin/python + @@ -99582,7 +99607,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/mkchecker.py tmp- + diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/mkheader.py tmp-linux-2.6-xen.patch/include/xen/interface/foreign/mkheader.py --- pristine-linux-2.6.18/include/xen/interface/foreign/mkheader.py 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/mkheader.py 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/mkheader.py 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,153 @@ +#!/usr/bin/python + @@ -99739,7 +99764,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/mkheader.py tmp-l + diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/reference.size tmp-linux-2.6-xen.patch/include/xen/interface/foreign/reference.size --- pristine-linux-2.6.18/include/xen/interface/foreign/reference.size 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/reference.size 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/reference.size 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,17 @@ + +structs | x86_32 x86_64 ia64 @@ -99760,7 +99785,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/reference.size tm + diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/structs.py tmp-linux-2.6-xen.patch/include/xen/interface/foreign/structs.py --- pristine-linux-2.6.18/include/xen/interface/foreign/structs.py 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/structs.py 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/foreign/structs.py 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,54 @@ +# configuration: what needs translation + @@ -99818,7 +99843,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/foreign/structs.py tmp-li + diff -Nurp pristine-linux-2.6.18/include/xen/interface/grant_table.h tmp-linux-2.6-xen.patch/include/xen/interface/grant_table.h --- pristine-linux-2.6.18/include/xen/interface/grant_table.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/grant_table.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/grant_table.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,399 @@ +/****************************************************************************** + * grant_table.h @@ -100221,7 +100246,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/grant_table.h tmp-linux-2 + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/e820.h tmp-linux-2.6-xen.patch/include/xen/interface/hvm/e820.h --- pristine-linux-2.6.18/include/xen/interface/hvm/e820.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/e820.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/e820.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,34 @@ + +/* @@ -100259,7 +100284,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/e820.h tmp-linux-2.6- +#endif /* __XEN_PUBLIC_HVM_E820_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/hvm_info_table.h tmp-linux-2.6-xen.patch/include/xen/interface/hvm/hvm_info_table.h --- pristine-linux-2.6.18/include/xen/interface/hvm/hvm_info_table.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/hvm_info_table.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/hvm_info_table.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,41 @@ +/****************************************************************************** + * hvm/hvm_info_table.h @@ -100304,7 +100329,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/hvm_info_table.h tmp- +#endif /* __XEN_PUBLIC_HVM_HVM_INFO_TABLE_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/hvm_op.h tmp-linux-2.6-xen.patch/include/xen/interface/hvm/hvm_op.h --- pristine-linux-2.6.18/include/xen/interface/hvm/hvm_op.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/hvm_op.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/hvm_op.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,76 @@ +/* + * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -100384,7 +100409,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/hvm_op.h tmp-linux-2. +#endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/ioreq.h tmp-linux-2.6-xen.patch/include/xen/interface/hvm/ioreq.h --- pristine-linux-2.6.18/include/xen/interface/hvm/ioreq.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/ioreq.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/ioreq.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,122 @@ +/* + * ioreq.h: I/O request definitions for device models @@ -100510,7 +100535,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/ioreq.h tmp-linux-2.6 + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/params.h tmp-linux-2.6-xen.patch/include/xen/interface/hvm/params.h --- pristine-linux-2.6.18/include/xen/interface/hvm/params.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/params.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/params.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,60 @@ +/* + * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -100574,7 +100599,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/params.h tmp-linux-2. +#endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/save.h tmp-linux-2.6-xen.patch/include/xen/interface/hvm/save.h --- pristine-linux-2.6.18/include/xen/interface/hvm/save.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/save.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/save.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,462 @@ +/* + * hvm/save.h @@ -101040,7 +101065,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/save.h tmp-linux-2.6- +#endif /* __XEN_PUBLIC_HVM_SAVE_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/vmx_assist.h tmp-linux-2.6-xen.patch/include/xen/interface/hvm/vmx_assist.h --- pristine-linux-2.6.18/include/xen/interface/hvm/vmx_assist.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/vmx_assist.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/hvm/vmx_assist.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,122 @@ +/* + * vmx_assist.h: Context definitions for the VMXASSIST world switch. @@ -101166,7 +101191,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/hvm/vmx_assist.h tmp-linu + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/blkif.h tmp-linux-2.6-xen.patch/include/xen/interface/io/blkif.h --- pristine-linux-2.6.18/include/xen/interface/io/blkif.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/blkif.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/blkif.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,128 @@ +/****************************************************************************** + * blkif.h @@ -101298,7 +101323,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/blkif.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/console.h tmp-linux-2.6-xen.patch/include/xen/interface/io/console.h --- pristine-linux-2.6.18/include/xen/interface/io/console.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/console.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/console.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,51 @@ +/****************************************************************************** + * console.h @@ -101353,7 +101378,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/console.h tmp-linux-2. + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/fbif.h tmp-linux-2.6-xen.patch/include/xen/interface/io/fbif.h --- pristine-linux-2.6.18/include/xen/interface/io/fbif.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/fbif.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/fbif.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,138 @@ +/* + * fbif.h -- Xen virtual frame buffer device @@ -101495,7 +101520,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/fbif.h tmp-linux-2.6-x + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/kbdif.h tmp-linux-2.6-xen.patch/include/xen/interface/io/kbdif.h --- pristine-linux-2.6.18/include/xen/interface/io/kbdif.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/kbdif.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/kbdif.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,130 @@ +/* + * kbdif.h -- Xen virtual keyboard/mouse @@ -101629,7 +101654,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/kbdif.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/netif.h tmp-linux-2.6-xen.patch/include/xen/interface/io/netif.h --- pristine-linux-2.6.18/include/xen/interface/io/netif.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/netif.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/netif.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,184 @@ +/****************************************************************************** + * netif.h @@ -101817,7 +101842,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/netif.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/pciif.h tmp-linux-2.6-xen.patch/include/xen/interface/io/pciif.h --- pristine-linux-2.6.18/include/xen/interface/io/pciif.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/pciif.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/pciif.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,83 @@ +/* + * PCI Backend/Frontend Common Data Structures & Macros @@ -101904,7 +101929,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/pciif.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/protocols.h tmp-linux-2.6-xen.patch/include/xen/interface/io/protocols.h --- pristine-linux-2.6.18/include/xen/interface/io/protocols.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/protocols.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/protocols.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,21 @@ +#ifndef __XEN_PROTOCOLS_H__ +#define __XEN_PROTOCOLS_H__ @@ -101929,7 +101954,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/protocols.h tmp-linux- +#endif diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/ring.h tmp-linux-2.6-xen.patch/include/xen/interface/io/ring.h --- pristine-linux-2.6.18/include/xen/interface/io/ring.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/ring.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/ring.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,299 @@ +/****************************************************************************** + * ring.h @@ -102232,7 +102257,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/ring.h tmp-linux-2.6-x + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/tpmif.h tmp-linux-2.6-xen.patch/include/xen/interface/io/tpmif.h --- pristine-linux-2.6.18/include/xen/interface/io/tpmif.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/tpmif.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/tpmif.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,77 @@ +/****************************************************************************** + * tpmif.h @@ -102313,7 +102338,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/tpmif.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/xenbus.h tmp-linux-2.6-xen.patch/include/xen/interface/io/xenbus.h --- pristine-linux-2.6.18/include/xen/interface/io/xenbus.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/xenbus.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/xenbus.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,73 @@ +/***************************************************************************** + * xenbus.h @@ -102390,7 +102415,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/xenbus.h tmp-linux-2.6 + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/xs_wire.h tmp-linux-2.6-xen.patch/include/xen/interface/io/xs_wire.h --- pristine-linux-2.6.18/include/xen/interface/io/xs_wire.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/io/xs_wire.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/io/xs_wire.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,121 @@ +/* + * Details of the "wire" protocol between Xen Store Daemon and client @@ -102515,7 +102540,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/io/xs_wire.h tmp-linux-2. + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/kexec.h tmp-linux-2.6-xen.patch/include/xen/interface/kexec.h --- pristine-linux-2.6.18/include/xen/interface/kexec.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/kexec.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/kexec.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,137 @@ +/****************************************************************************** + * kexec.h - Public portion @@ -102656,7 +102681,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/kexec.h tmp-linux-2.6-xen + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/libelf.h tmp-linux-2.6-xen.patch/include/xen/interface/libelf.h --- pristine-linux-2.6.18/include/xen/interface/libelf.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/libelf.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/libelf.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,241 @@ +#ifndef __XC_LIBELF__ +#define __XC_LIBELF__ 1 @@ -102901,7 +102926,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/libelf.h tmp-linux-2.6-xe +#endif /* __XC_LIBELF__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/memory.h tmp-linux-2.6-xen.patch/include/xen/interface/memory.h --- pristine-linux-2.6.18/include/xen/interface/memory.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/memory.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/memory.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,281 @@ +/****************************************************************************** + * memory.h @@ -103186,7 +103211,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/memory.h tmp-linux-2.6-xe + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/nmi.h tmp-linux-2.6-xen.patch/include/xen/interface/nmi.h --- pristine-linux-2.6.18/include/xen/interface/nmi.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/nmi.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/nmi.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,78 @@ +/****************************************************************************** + * nmi.h @@ -103268,7 +103293,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/nmi.h tmp-linux-2.6-xen.p + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/physdev.h tmp-linux-2.6-xen.patch/include/xen/interface/physdev.h --- pristine-linux-2.6.18/include/xen/interface/physdev.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/physdev.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/physdev.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,169 @@ +/* + * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -103441,7 +103466,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/physdev.h tmp-linux-2.6-x + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/platform.h tmp-linux-2.6-xen.patch/include/xen/interface/platform.h --- pristine-linux-2.6.18/include/xen/interface/platform.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/platform.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/platform.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,183 @@ +/****************************************************************************** + * platform.h @@ -103628,7 +103653,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/platform.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/sched.h tmp-linux-2.6-xen.patch/include/xen/interface/sched.h --- pristine-linux-2.6.18/include/xen/interface/sched.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/sched.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/sched.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,121 @@ +/****************************************************************************** + * sched.h @@ -103753,7 +103778,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/sched.h tmp-linux-2.6-xen + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/sysctl.h tmp-linux-2.6-xen.patch/include/xen/interface/sysctl.h --- pristine-linux-2.6.18/include/xen/interface/sysctl.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/sysctl.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/sysctl.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,198 @@ +/****************************************************************************** + * sysctl.h @@ -103955,7 +103980,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/sysctl.h tmp-linux-2.6-xe + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/trace.h tmp-linux-2.6-xen.patch/include/xen/interface/trace.h --- pristine-linux-2.6.18/include/xen/interface/trace.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/trace.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/trace.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,120 @@ +/****************************************************************************** + * include/public/trace.h @@ -104079,7 +104104,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/trace.h tmp-linux-2.6-xen + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/vcpu.h tmp-linux-2.6-xen.patch/include/xen/interface/vcpu.h --- pristine-linux-2.6.18/include/xen/interface/vcpu.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/vcpu.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/vcpu.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,192 @@ +/****************************************************************************** + * vcpu.h @@ -104275,7 +104300,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/vcpu.h tmp-linux-2.6-xen. + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/version.h tmp-linux-2.6-xen.patch/include/xen/interface/version.h --- pristine-linux-2.6.18/include/xen/interface/version.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/version.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/version.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,91 @@ +/****************************************************************************** + * version.h @@ -104370,7 +104395,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/version.h tmp-linux-2.6-x + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xen-compat.h tmp-linux-2.6-xen.patch/include/xen/interface/xen-compat.h --- pristine-linux-2.6.18/include/xen/interface/xen-compat.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/xen-compat.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/xen-compat.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,51 @@ +/****************************************************************************** + * xen-compat.h @@ -104425,7 +104450,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xen-compat.h tmp-linux-2. +#endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xen.h tmp-linux-2.6-xen.patch/include/xen/interface/xen.h --- pristine-linux-2.6.18/include/xen/interface/xen.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/xen.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/xen.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,612 @@ +/****************************************************************************** + * xen.h @@ -105041,7 +105066,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xen.h tmp-linux-2.6-xen.p + */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xencomm.h tmp-linux-2.6-xen.patch/include/xen/interface/xencomm.h --- pristine-linux-2.6.18/include/xen/interface/xencomm.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/xencomm.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/xencomm.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,41 @@ +/* + * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -105086,7 +105111,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xencomm.h tmp-linux-2.6-x +#endif /* _XEN_XENCOMM_H_ */ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xenoprof.h tmp-linux-2.6-xen.patch/include/xen/interface/xenoprof.h --- pristine-linux-2.6.18/include/xen/interface/xenoprof.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/interface/xenoprof.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/interface/xenoprof.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,138 @@ +/****************************************************************************** + * xenoprof.h @@ -105228,7 +105253,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/interface/xenoprof.h tmp-linux-2.6- + */ diff -Nurp pristine-linux-2.6.18/include/xen/pcifront.h tmp-linux-2.6-xen.patch/include/xen/pcifront.h --- pristine-linux-2.6.18/include/xen/pcifront.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/pcifront.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/pcifront.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,83 @@ +/* + * PCI Frontend - arch-dependendent declarations @@ -105315,7 +105340,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/pcifront.h tmp-linux-2.6-xen.patch/ +#endif /* __XEN_ASM_PCIFRONT_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/public/evtchn.h tmp-linux-2.6-xen.patch/include/xen/public/evtchn.h --- pristine-linux-2.6.18/include/xen/public/evtchn.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/public/evtchn.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/public/evtchn.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,88 @@ +/****************************************************************************** + * evtchn.h @@ -105407,7 +105432,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/public/evtchn.h tmp-linux-2.6-xen.p +#endif /* __LINUX_PUBLIC_EVTCHN_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/public/gntdev.h tmp-linux-2.6-xen.patch/include/xen/public/gntdev.h --- pristine-linux-2.6.18/include/xen/public/gntdev.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/public/gntdev.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/public/gntdev.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,105 @@ +/****************************************************************************** + * gntdev.h @@ -105516,7 +105541,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/public/gntdev.h tmp-linux-2.6-xen.p +#endif /* __LINUX_PUBLIC_GNTDEV_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/public/privcmd.h tmp-linux-2.6-xen.patch/include/xen/public/privcmd.h --- pristine-linux-2.6.18/include/xen/public/privcmd.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/public/privcmd.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/public/privcmd.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,79 @@ +/****************************************************************************** + * privcmd.h @@ -105599,7 +105624,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/public/privcmd.h tmp-linux-2.6-xen. +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/xen_proc.h tmp-linux-2.6-xen.patch/include/xen/xen_proc.h --- pristine-linux-2.6.18/include/xen/xen_proc.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/xen_proc.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/xen_proc.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,12 @@ + +#ifndef __ASM_XEN_PROC_H__ @@ -105615,7 +105640,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/xen_proc.h tmp-linux-2.6-xen.patch/ +#endif /* __ASM_XEN_PROC_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/xenbus.h tmp-linux-2.6-xen.patch/include/xen/xenbus.h --- pristine-linux-2.6.18/include/xen/xenbus.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/xenbus.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/xenbus.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,304 @@ +/****************************************************************************** + * xenbus.h @@ -105923,7 +105948,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/xenbus.h tmp-linux-2.6-xen.patch/in +#endif /* _XEN_XENBUS_H */ diff -Nurp pristine-linux-2.6.18/include/xen/xencons.h tmp-linux-2.6-xen.patch/include/xen/xencons.h --- pristine-linux-2.6.18/include/xen/xencons.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/xencons.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/xencons.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,19 @@ +#ifndef __ASM_XENCONS_H__ +#define __ASM_XENCONS_H__ @@ -105946,7 +105971,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/xencons.h tmp-linux-2.6-xen.patch/i +#endif /* __ASM_XENCONS_H__ */ diff -Nurp pristine-linux-2.6.18/include/xen/xenoprof.h tmp-linux-2.6-xen.patch/include/xen/xenoprof.h --- pristine-linux-2.6.18/include/xen/xenoprof.h 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/include/xen/xenoprof.h 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/include/xen/xenoprof.h 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,42 @@ +/****************************************************************************** + * xen/xenoprof.h @@ -105992,7 +106017,7 @@ diff -Nurp pristine-linux-2.6.18/include/xen/xenoprof.h tmp-linux-2.6-xen.patch/ +#endif /* __XEN_XENOPROF_H__ */ diff -Nurp pristine-linux-2.6.18/kernel/Kconfig.preempt tmp-linux-2.6-xen.patch/kernel/Kconfig.preempt --- pristine-linux-2.6.18/kernel/Kconfig.preempt 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/kernel/Kconfig.preempt 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/kernel/Kconfig.preempt 2007-11-14 15:35:27.000000000 -0800 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY config PREEMPT @@ -106003,7 +106028,7 @@ diff -Nurp pristine-linux-2.6.18/kernel/Kconfig.preempt tmp-linux-2.6-xen.patch/ all kernel code (that is not executing in a critical section) diff -Nurp pristine-linux-2.6.18/kernel/fork.c tmp-linux-2.6-xen.patch/kernel/fork.c --- pristine-linux-2.6.18/kernel/fork.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/kernel/fork.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/kernel/fork.c 2007-11-14 15:35:27.000000000 -0800 @@ -276,6 +276,9 @@ static inline int dup_mmap(struct mm_str if (retval) goto out; @@ -106016,7 +106041,7 @@ diff -Nurp pristine-linux-2.6.18/kernel/fork.c tmp-linux-2.6-xen.patch/kernel/fo up_write(&mm->mmap_sem); diff -Nurp pristine-linux-2.6.18/kernel/irq/spurious.c tmp-linux-2.6-xen.patch/kernel/irq/spurious.c --- pristine-linux-2.6.18/kernel/irq/spurious.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/kernel/irq/spurious.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/kernel/irq/spurious.c 2007-11-14 15:35:27.000000000 -0800 @@ -139,7 +139,8 @@ void note_interrupt(unsigned int irq, st irqreturn_t action_ret, struct pt_regs *regs) { @@ -106029,7 +106054,7 @@ diff -Nurp pristine-linux-2.6.18/kernel/irq/spurious.c tmp-linux-2.6-xen.patch/k } diff -Nurp pristine-linux-2.6.18/kernel/kexec.c tmp-linux-2.6-xen.patch/kernel/kexec.c --- pristine-linux-2.6.18/kernel/kexec.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/kernel/kexec.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/kernel/kexec.c 2007-11-14 15:35:27.000000000 -0800 @@ -330,13 +330,26 @@ static int kimage_is_destination_range(s return 0; } @@ -106250,7 +106275,7 @@ diff -Nurp pristine-linux-2.6.18/kernel/kexec.c tmp-linux-2.6-xen.patch/kernel/k * we are using after a panic on a different cpu. diff -Nurp pristine-linux-2.6.18/kernel/softlockup.c tmp-linux-2.6-xen.patch/kernel/softlockup.c --- pristine-linux-2.6.18/kernel/softlockup.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/kernel/softlockup.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/kernel/softlockup.c 2007-11-16 16:18:13.000000000 -0800 @@ -40,6 +40,19 @@ void touch_softlockup_watchdog(void) } EXPORT_SYMBOL(touch_softlockup_watchdog); @@ -106273,7 +106298,7 @@ diff -Nurp pristine-linux-2.6.18/kernel/softlockup.c tmp-linux-2.6-xen.patch/ker * whether the watchdog thread has hung or not: diff -Nurp pristine-linux-2.6.18/kernel/timer.c tmp-linux-2.6-xen.patch/kernel/timer.c --- pristine-linux-2.6.18/kernel/timer.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/kernel/timer.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/kernel/timer.c 2007-11-16 16:18:13.000000000 -0800 @@ -485,7 +485,9 @@ unsigned long next_timer_interrupt(void) if (hr_expires < 3) return hr_expires + jiffies; @@ -106287,7 +106312,7 @@ diff -Nurp pristine-linux-2.6.18/kernel/timer.c tmp-linux-2.6-xen.patch/kernel/t spin_lock(&base->lock); diff -Nurp pristine-linux-2.6.18/lib/Makefile tmp-linux-2.6-xen.patch/lib/Makefile --- pristine-linux-2.6.18/lib/Makefile 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/lib/Makefile 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/lib/Makefile 2007-11-14 15:35:27.000000000 -0800 @@ -52,6 +52,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o @@ -106298,7 +106323,7 @@ diff -Nurp pristine-linux-2.6.18/lib/Makefile tmp-linux-2.6-xen.patch/lib/Makefi clean-files := crc32table.h diff -Nurp pristine-linux-2.6.18/mm/Kconfig tmp-linux-2.6-xen.patch/mm/Kconfig --- pristine-linux-2.6.18/mm/Kconfig 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/mm/Kconfig 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/mm/Kconfig 2007-11-14 15:35:27.000000000 -0800 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc # Default to 4 for wider testing, though 8 might be more appropriate. # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock. @@ -106316,7 +106341,7 @@ diff -Nurp pristine-linux-2.6.18/mm/Kconfig tmp-linux-2.6-xen.patch/mm/Kconfig # diff -Nurp pristine-linux-2.6.18/mm/highmem.c tmp-linux-2.6-xen.patch/mm/highmem.c --- pristine-linux-2.6.18/mm/highmem.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/mm/highmem.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/mm/highmem.c 2007-11-14 15:35:27.000000000 -0800 @@ -142,6 +142,17 @@ start: return vaddr; } @@ -106337,7 +106362,7 @@ diff -Nurp pristine-linux-2.6.18/mm/highmem.c tmp-linux-2.6-xen.patch/mm/highmem unsigned long vaddr; diff -Nurp pristine-linux-2.6.18/mm/memory.c tmp-linux-2.6-xen.patch/mm/memory.c --- pristine-linux-2.6.18/mm/memory.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/mm/memory.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/mm/memory.c 2007-11-14 15:35:27.000000000 -0800 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar * and that the resulting page looks ok. */ @@ -106511,7 +106536,7 @@ diff -Nurp pristine-linux-2.6.18/mm/memory.c tmp-linux-2.6-xen.patch/mm/memory.c * which was read non-atomically. Before making any commitment, on diff -Nurp pristine-linux-2.6.18/mm/mmap.c tmp-linux-2.6-xen.patch/mm/mmap.c --- pristine-linux-2.6.18/mm/mmap.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/mm/mmap.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/mm/mmap.c 2007-11-14 15:35:27.000000000 -0800 @@ -1963,6 +1963,10 @@ void exit_mmap(struct mm_struct *mm) unsigned long nr_accounted = 0; unsigned long end; @@ -106525,7 +106550,7 @@ diff -Nurp pristine-linux-2.6.18/mm/mmap.c tmp-linux-2.6-xen.patch/mm/mmap.c tlb = tlb_gather_mmu(mm, 1); diff -Nurp pristine-linux-2.6.18/mm/page_alloc.c tmp-linux-2.6-xen.patch/mm/page_alloc.c --- pristine-linux-2.6.18/mm/page_alloc.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/mm/page_alloc.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/mm/page_alloc.c 2007-11-14 15:35:27.000000000 -0800 @@ -154,7 +154,11 @@ static void bad_page(struct page *page) 1 << PG_slab | 1 << PG_swapcache | @@ -106587,7 +106612,7 @@ diff -Nurp pristine-linux-2.6.18/mm/page_alloc.c tmp-linux-2.6-xen.patch/mm/page page->mapping = NULL; diff -Nurp pristine-linux-2.6.18/net/core/dev.c tmp-linux-2.6-xen.patch/net/core/dev.c --- pristine-linux-2.6.18/net/core/dev.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/net/core/dev.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/net/core/dev.c 2007-11-14 15:35:27.000000000 -0800 @@ -113,11 +113,18 @@ #include <linux/wireless.h> #include <net/iw_handler.h> @@ -106703,7 +106728,7 @@ diff -Nurp pristine-linux-2.6.18/net/core/dev.c tmp-linux-2.6-xen.patch/net/core EXPORT_SYMBOL(br_handle_frame_hook); diff -Nurp pristine-linux-2.6.18/net/core/skbuff.c tmp-linux-2.6-xen.patch/net/core/skbuff.c --- pristine-linux-2.6.18/net/core/skbuff.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/net/core/skbuff.c 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/net/core/skbuff.c 2007-11-14 15:35:27.000000000 -0800 @@ -240,6 +240,7 @@ struct sk_buff *alloc_skb_from_cache(kme skb_shinfo(skb)->gso_size = 0; skb_shinfo(skb)->gso_segs = 0; @@ -106725,7 +106750,7 @@ diff -Nurp pristine-linux-2.6.18/net/core/skbuff.c tmp-linux-2.6-xen.patch/net/c C(priority); diff -Nurp pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_tcp.c tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_tcp.c --- pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-11-16 16:18:12.000000000 -0800 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb, if (hdrsize < sizeof(*hdr)) return 1; @@ -106742,7 +106767,7 @@ diff -Nurp pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_tcp.c tmp-linux hdr->check)); diff -Nurp pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_udp.c tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_udp.c --- pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-11-16 16:18:12.000000000 -0800 @@ -113,11 +113,17 @@ udp_manip_pkt(struct sk_buff **pskb, newport = tuple->dst.u.udp.port; portptr = &hdr->dest; @@ -106765,7 +106790,7 @@ diff -Nurp pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_udp.c tmp-linux } diff -Nurp pristine-linux-2.6.18/net/ipv4/tcp_input.c tmp-linux-2.6-xen.patch/net/ipv4/tcp_input.c --- pristine-linux-2.6.18/net/ipv4/tcp_input.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/net/ipv4/tcp_input.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/net/ipv4/tcp_input.c 2007-11-16 16:18:12.000000000 -0800 @@ -127,7 +127,7 @@ static void tcp_measure_rcv_mss(struct s /* skb->len may jitter because of SACKs, even if peer * sends good full-sized frames. @@ -106777,7 +106802,7 @@ diff -Nurp pristine-linux-2.6.18/net/ipv4/tcp_input.c tmp-linux-2.6-xen.patch/ne } else { diff -Nurp pristine-linux-2.6.18/net/ipv4/xfrm4_output.c tmp-linux-2.6-xen.patch/net/ipv4/xfrm4_output.c --- pristine-linux-2.6.18/net/ipv4/xfrm4_output.c 2006-09-19 20:42:06.000000000 -0700 -+++ tmp-linux-2.6-xen.patch/net/ipv4/xfrm4_output.c 2007-10-15 11:42:06.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/net/ipv4/xfrm4_output.c 2007-11-16 16:18:12.000000000 -0800 @@ -18,6 +18,8 @@ #include <net/xfrm.h> #include <net/icmp.h> @@ -106800,7 +106825,7 @@ diff -Nurp pristine-linux-2.6.18/net/ipv4/xfrm4_output.c tmp-linux-2.6-xen.patch if (err) diff -Nurp pristine-linux-2.6.18/scripts/Makefile.xen tmp-linux-2.6-xen.patch/scripts/Makefile.xen --- pristine-linux-2.6.18/scripts/Makefile.xen 1969-12-31 16:00:00.000000000 -0800 -+++ tmp-linux-2.6-xen.patch/scripts/Makefile.xen 2007-10-11 00:15:26.000000000 -0700 ++++ tmp-linux-2.6-xen.patch/scripts/Makefile.xen 2007-11-14 15:35:27.000000000 -0800 @@ -0,0 +1,14 @@ + +# cherrypickxen($1 = allobj) |