Acked-by: jbeulich@novell.com
-Index: head-2008-12-01/arch/x86/Kconfig
-===================================================================
---- head-2008-12-01.orig/arch/x86/Kconfig 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/Kconfig 2008-12-01 11:32:38.000000000 +0100
-@@ -1427,7 +1427,7 @@ config PHYSICAL_START
+--- sle11-2009-05-14.orig/arch/x86/Kconfig 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/Kconfig 2009-02-05 10:22:19.000000000 +0100
+@@ -1431,7 +1431,7 @@ config PHYSICAL_START
config RELOCATABLE
bool "Build a relocatable kernel (EXPERIMENTAL)"
help
This builds a kernel image that retains relocation information
so it can be loaded someplace besides the default 1MB.
-Index: head-2008-12-01/arch/x86/kernel/asm-offsets_32.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/asm-offsets_32.c 2008-12-01 11:21:02.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/asm-offsets_32.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/asm-offsets_32.c 2008-11-25 12:35:53.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/asm-offsets_32.c 2008-12-15 11:26:44.000000000 +0100
@@ -54,6 +54,7 @@ void foo(void)
OFFSET(TI_exec_domain, thread_info, exec_domain);
OFFSET(TI_flags, thread_info, flags);
#ifdef CONFIG_PARAVIRT
BLANK();
OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
-Index: head-2008-12-01/arch/x86/kernel/cpu/common-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/cpu/common-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/cpu/common-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/cpu/common-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/cpu/common-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -22,6 +22,7 @@
#define phys_pkg_id(a,b) a
#endif
#ifdef CONFIG_HOTPLUG_CPU
void __cpuinit cpu_uninit(void)
{
-Index: head-2008-12-01/arch/x86/kernel/cpu/mtrr/main-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -12,7 +12,7 @@
static DEFINE_MUTEX(mtrr_mutex);
int error = -EINVAL;
struct xen_platform_op op;
-Index: head-2008-12-01/arch/x86/kernel/e820_32-xen.c
-===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2008-12-01/arch/x86/kernel/e820_32-xen.c 2008-12-01 11:32:38.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/e820_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -0,0 +1,1015 @@
+#include <linux/kernel.h>
+#include <linux/types.h>
+ return 0;
+}
+early_param("memmap", parse_memmap);
-Index: head-2008-12-01/arch/x86/kernel/entry_32-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/entry_32-xen.S 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/entry_32-xen.S 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:07:47.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:08:06.000000000 +0200
@@ -30,12 +30,13 @@
* 18(%esp) - %eax
* 1C(%esp) - %ds
movl $(__USER_DS), %ecx
movl %ecx, %ds
movl %ecx, %es
-@@ -793,7 +784,7 @@ ENTRY(hypervisor_callback)
+@@ -793,8 +784,8 @@ ENTRY(hypervisor_callback)
pushl %eax
CFI_ADJUST_CFA_OFFSET 4
SAVE_ALL
+- movl CS(%esp),%ecx
- movl EIP(%esp),%eax
++ movl PT_CS(%esp),%ecx
+ movl PT_EIP(%esp),%eax
- cmpl $scrit,%eax
- jb 11f
- cmpl $ecrit,%eax
-@@ -802,7 +793,7 @@ ENTRY(hypervisor_callback)
- jb 11f
+ andl $SEGMENT_RPL_MASK,%ecx
+ cmpl $USER_RPL,%ecx
+ jae .Ldo_upcall
+@@ -808,7 +799,7 @@ ENTRY(hypervisor_callback)
+ jb .Ldo_upcall
cmpl $sysexit_ecrit,%eax
- ja 11f
+ ja .Ldo_upcall
- addl $OLDESP,%esp # Remove eflags...ebx from stack frame.
+ addl $PT_OLDESP,%esp # Remove eflags...ebx from stack frame.
- 11: push %esp
- CFI_ADJUST_CFA_OFFSET 4
- call evtchn_do_upcall
-@@ -824,7 +815,7 @@ critical_region_fixup:
- jne 15f
- xorl %ecx,%ecx
- 15: leal (%esp,%ecx),%esi # %esi points at end of src region
+ #endif
+ .Ldo_upcall:
+ push %esp
+@@ -830,7 +821,7 @@ critical_region_fixup:
+ movsbl critical_fixup_table-scrit(%eax),%ecx # %ecx contains num slots popped
+ testl %ecx,%ecx
+ leal (%esp,%ecx,4),%esi # %esi points at end of src region
- leal OLDESP(%esp),%edi # %edi points at end of dst region
+ leal PT_OLDESP(%esp),%edi # %edi points at end of dst region
- shrl $2,%ecx # convert words to bytes
- je 17f # skip loop if nothing to copy
+ jle 17f # skip loop if nothing to copy
16: subl $4,%esi # pre-decrementing copy loop
-@@ -848,8 +839,9 @@ critical_fixup_table:
- .byte 0x18 # pop %eax
- .byte 0x1c # pop %ds
- .byte 0x20 # pop %es
-- .byte 0x24,0x24,0x24 # add $4,%esp
-- .byte 0x28 # iret
-+ .byte 0x24,0x24 # pop %gs
-+ .byte 0x28,0x28,0x28 # add $4,%esp
-+ .byte 0x2c # iret
- .byte 0xff,0xff,0xff,0xff # movb $1,1(%esi)
- .byte 0x00,0x00 # jmp 11b
+ subl $4,%edi
+@@ -853,8 +844,9 @@ critical_fixup_table:
+ .byte 6 # pop %eax
+ .byte 7 # pop %ds
+ .byte 8 # pop %es
+- .byte 9,9,9 # add $4,%esp
+- .byte 10 # iret
++ .byte 9,9 # pop %gs
++ .byte 10,10,10 # add $4,%esp
++ .byte 11 # iret
+ .byte -1,-1,-1,-1 # movb $1,1(%esi) = __DISABLE_INTERRUPTS
.previous
-@@ -940,7 +932,7 @@ ENTRY(device_not_available)
+
+@@ -944,7 +936,7 @@ ENTRY(device_not_available)
jmp ret_from_exception
device_available_emulate:
#endif
call math_state_restore
jmp ret_from_exception
CFI_ENDPROC
-@@ -1010,7 +1002,7 @@ KPROBE_ENTRY(nmi)
+@@ -1014,7 +1006,7 @@ KPROBE_ENTRY(nmi)
cmpw $__ESPFIX_SS, %ax
popl %eax
CFI_ADJUST_CFA_OFFSET -4
cmpl $sysenter_entry,(%esp)
je nmi_stack_fixup
pushl %eax
-@@ -1053,7 +1045,7 @@ nmi_debug_stack_check:
+@@ -1057,7 +1049,7 @@ nmi_debug_stack_check:
FIX_STACK(24,nmi_stack_correct, 1)
jmp nmi_stack_correct
/* We have a RING0_INT_FRAME here.
*
* create the pointer to lss back
-@@ -1062,7 +1054,6 @@ nmi_16bit_stack:
+@@ -1066,7 +1058,6 @@ nmi_16bit_stack:
CFI_ADJUST_CFA_OFFSET 4
pushl %esp
CFI_ADJUST_CFA_OFFSET 4
addw $4, (%esp)
/* copy the iret frame of 12 bytes */
.rept 3
-@@ -1073,11 +1064,11 @@ nmi_16bit_stack:
+@@ -1077,11 +1068,11 @@ nmi_16bit_stack:
CFI_ADJUST_CFA_OFFSET 4
SAVE_ALL
FIXUP_ESPFIX_STACK # %eax == %esp
1: INTERRUPT_RETURN
CFI_ENDPROC
.section __ex_table,"a"
-@@ -1093,12 +1084,25 @@ KPROBE_ENTRY(nmi)
+@@ -1097,12 +1088,25 @@ KPROBE_ENTRY(nmi)
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
KPROBE_ENTRY(int3)
RING0_INT_FRAME
pushl $-1 # mark this as an int
-@@ -1214,37 +1218,6 @@ ENTRY(spurious_interrupt_bug)
+@@ -1218,37 +1222,6 @@ ENTRY(spurious_interrupt_bug)
CFI_ENDPROC
#endif /* !CONFIG_XEN */
ENTRY(fixup_4gb_segment)
RING0_EC_FRAME
pushl $do_fixup_4gb_segment
-Index: head-2008-12-01/arch/x86/kernel/head_32-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/head_32-xen.S 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/head_32-xen.S 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/head_32-xen.S 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/head_32-xen.S 2008-12-15 11:26:44.000000000 +0100
@@ -9,6 +9,7 @@
#include <asm/cache.h>
#include <asm/thread_info.h>
.ascii ",FEATURES=writable_page_tables"
.ascii "|writable_descriptor_tables"
.ascii "|auto_translated_physmap"
-Index: head-2008-12-01/arch/x86/kernel/io_apic_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/io_apic_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/io_apic_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/io_apic_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/pci.h>
#include <linux/msi.h>
set_native_irq_info(irq, TARGET_CPUS);
spin_unlock_irqrestore(&ioapic_lock, flags);
-Index: head-2008-12-01/arch/x86/kernel/ldt_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/ldt_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/ldt_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/ldt_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/ldt_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -177,16 +177,14 @@ static int read_default_ldt(void __user
{
int err;
err = -EFAULT;
return err;
-Index: head-2008-12-01/arch/x86/kernel/microcode-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/microcode-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/microcode-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/microcode-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/microcode-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -1,7 +1,7 @@
/*
* Intel CPU Microcode Update Driver for Linux
return 0;
}
-Index: head-2008-12-01/arch/x86/kernel/mpparse_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/mpparse_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/mpparse_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/mpparse_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -36,7 +36,7 @@
/* Have we found an MP table */
{
struct mpc_config_processor processor;
int boot_cpu = 0;
-Index: head-2008-12-01/arch/x86/kernel/pci-dma-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/pci-dma-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/pci-dma-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/pci-dma-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/pci-dma-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -276,7 +276,7 @@ EXPORT_SYMBOL(dma_free_coherent);
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags)
return 0;
}
EXPORT_SYMBOL(dma_declare_coherent_memory);
-Index: head-2008-12-01/arch/x86/kernel/process_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/process_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/process_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/process_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -60,6 +60,7 @@
#include <asm/tlbflush.h>
return prev_p;
}
-Index: head-2008-12-01/arch/x86/kernel/quirks-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/quirks-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/quirks-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/quirks-xen.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/quirks-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -3,10 +3,12 @@
*/
#include <linux/pci.h>
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, verify_quirk_intel_irqbalance);
+
#endif
-Index: head-2008-12-01/arch/x86/kernel/setup_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/setup_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/setup_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/setup_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/setup_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -76,9 +76,6 @@
#include <xen/interface/kexec.h>
#endif
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
-Index: head-2008-12-01/arch/x86/kernel/smp_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/smp_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/smp_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/smp_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/smp_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -659,6 +659,10 @@ int smp_call_function_single(int cpu, vo
put_cpu();
return -EBUSY;
spin_lock_bh(&call_lock);
__smp_call_function_single(cpu, func, info, nonatomic, wait);
spin_unlock_bh(&call_lock);
-Index: head-2008-12-01/arch/x86/kernel/time_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/time_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/time_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/time_32-xen.c 2009-03-24 10:08:00.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/time_32-xen.c 2009-03-24 10:08:30.000000000 +0100
@@ -61,6 +61,7 @@
#include <asm/uaccess.h>
#include <asm/processor.h>
/*
* GCC 4.3 can turn loops over an induction variable into division. We do
-@@ -544,10 +545,7 @@ static int set_rtc_mmss(unsigned long no
+@@ -543,10 +544,7 @@ static int set_rtc_mmss(unsigned long no
/* gets recalled with irq locally disabled */
/* XXX - does irqsave resolve this? -johnstul */
spin_lock_irqsave(&rtc_lock, flags);
spin_unlock_irqrestore(&rtc_lock, flags);
return retval;
-@@ -874,10 +872,7 @@ unsigned long get_cmos_time(void)
+@@ -873,10 +871,7 @@ unsigned long get_cmos_time(void)
spin_lock_irqsave(&rtc_lock, flags);
spin_unlock_irqrestore(&rtc_lock, flags);
-@@ -979,7 +974,7 @@ static void __init hpet_time_init(void)
+@@ -978,7 +973,7 @@ static void __init hpet_time_init(void)
printk("Using HPET for base-timer\n");
}
}
#endif
-Index: head-2008-12-01/arch/x86/kernel/traps_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/traps_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/traps_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/traps_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/traps_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -29,6 +29,8 @@
#include <linux/kexec.h>
#include <linux/unwind.h>
-}
-__setup("call_trace=", call_trace_setup);
-#endif
-Index: head-2008-12-01/arch/x86/kernel/vmlinux_32.lds.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/vmlinux_32.lds.S 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/vmlinux_32.lds.S 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/vmlinux_32.lds.S 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/vmlinux_32.lds.S 2008-12-15 11:26:44.000000000 +0100
@@ -29,6 +29,12 @@ PHDRS {
SECTIONS
{
phys_startup_32 = startup_32 - LOAD_OFFSET;
.text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
-Index: head-2008-12-01/arch/x86/kvm/Kconfig
-===================================================================
---- head-2008-12-01.orig/arch/x86/kvm/Kconfig 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/arch/x86/kvm/Kconfig 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kvm/Kconfig 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kvm/Kconfig 2008-12-15 11:26:44.000000000 +0100
@@ -7,6 +7,7 @@ config HAVE_KVM
menuconfig VIRTUALIZATION
bool "Virtualization"
default y
---help---
Say Y here to get to see options for using your Linux host to run other
-Index: head-2008-12-01/arch/x86/mm/fault_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/fault_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/fault_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/fault_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/fault_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -22,9 +22,9 @@
#include <linux/highmem.h>
#include <linux/module.h>
break;
prefetch = (instr_lo == 0xF) &&
(opcode == 0x0D || opcode == 0x18);
-Index: head-2008-12-01/arch/x86/mm/highmem_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/highmem_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/highmem_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/highmem_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/highmem_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -32,7 +32,7 @@ static void *__kmap_atomic(struct page *
unsigned long vaddr;
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-Index: head-2008-12-01/arch/x86/mm/init_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/init_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/init_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/init_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/init_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -233,8 +233,6 @@ static inline int page_kills_ppro(unsign
#endif
void __init pgtable_cache_init(void)
{
-Index: head-2008-12-01/arch/x86/mm/pgtable_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/pgtable_32-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/pgtable_32-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/pgtable_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/pgtable_32-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -203,7 +203,7 @@ void pte_free(struct page *pte)
__free_page(pte);
}
{
unsigned long flags; /* can be called from interrupt context */
-Index: head-2008-12-01/arch/x86/pci/irq-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/pci/irq-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/pci/irq-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/pci/irq-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/pci/irq-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -768,7 +768,7 @@ static void __init pirq_find_router(stru
DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
rt->rtr_vendor, rt->rtr_device);
}
static struct irq_info *pirq_get_info(struct pci_dev *dev)
-Index: head-2008-12-01/arch/x86/kernel/entry_64-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/entry_64-xen.S 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/entry_64-xen.S 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/entry_64-xen.S 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/entry_64-xen.S 2008-12-15 11:26:44.000000000 +0100
@@ -261,7 +261,6 @@ ENTRY(system_call)
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
GET_THREAD_INFO(%rcx)
- CFI_ENDPROC
-ENDPROC(arch_unwind_init_running)
-#endif
-Index: head-2008-12-01/arch/x86/kernel/genapic_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/genapic_64-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head-2008-12-01/arch/x86/kernel/genapic_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/genapic_64-xen.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/genapic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -34,6 +34,7 @@ extern struct genapic apic_physflat;
#ifndef CONFIG_XEN
#if defined(CONFIG_ACPI)
/*
* Some x86_64 machines use physical APIC mode regardless of how many
-Index: head-2008-12-01/arch/x86/kernel/head64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/head64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/head64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/head64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/head64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -104,7 +104,10 @@ void __init x86_64_start_kernel(char * r
machine_to_phys_order++;
set_intr_gate(i, early_idt_handler);
asm volatile("lidt %0" :: "m" (idt_descr));
#endif
-Index: head-2008-12-01/arch/x86/kernel/io_apic_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/io_apic_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/io_apic_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/io_apic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -202,14 +202,20 @@ static struct IO_APIC_route_entry ioapic
* the interrupt, and we need to make sure the entry is fully populated
* before that happens.
}
}
-Index: head-2008-12-01/arch/x86/kernel/irq_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/irq_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/irq_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/irq_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/irq_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -120,7 +120,7 @@ asmlinkage unsigned int do_IRQ(struct pt
if (likely(irq < NR_IRQS))
printk(KERN_EMERG "%s: %d.%d No irq handler for irq\n",
__func__, smp_processor_id(), irq);
-Index: head-2008-12-01/arch/x86/kernel/mpparse_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/mpparse_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/mpparse_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/mpparse_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -35,8 +35,6 @@
int smp_found_config;
unsigned int __initdata maxcpus = NR_CPUS;
/*
* Various Linux-internal data structures created from the
* MP-table.
-Index: head-2008-12-01/arch/x86/kernel/process_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/process_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/process_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/process_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -119,29 +119,23 @@ void exit_idle(void)
static void poll_idle (void)
{
enter_idle();
idle();
/* In many cases the interrupt that ended idle
-Index: head-2008-12-01/arch/x86/kernel/setup_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/setup_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/setup_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/setup_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/setup_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -573,8 +573,7 @@ void __init setup_arch(char **cmdline_p)
if (LOADER_TYPE && INITRD_START) {
if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
c->x86_max_cores = intel_num_cpu_cores(c);
srat_detect_node();
-Index: head-2008-12-01/arch/x86/kernel/smp_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/smp_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/smp_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/smp_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/smp_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -384,12 +384,17 @@ int smp_call_function_single (int cpu, v
put_cpu();
return 0;
/*
* this function sends a 'generic call function' IPI to all other CPUs
-Index: head-2008-12-01/arch/x86/kernel/traps_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/traps_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/traps_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/traps_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/traps_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -30,9 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kexec.h>
-}
-early_param("call_trace", call_trace_setup);
-#endif
-Index: head-2008-12-01/arch/x86/kernel/vsyscall_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/vsyscall_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/vsyscall_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/vsyscall_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/vsyscall_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/topology.h>
__set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
}
-Index: head-2008-12-01/arch/x86/mm/fault_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/fault_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/fault_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/fault_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/fault_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -23,9 +23,9 @@
#include <linux/compiler.h>
#include <linux/module.h>
}
void dump_pagetable(unsigned long address)
-Index: head-2008-12-01/arch/x86/mm/init_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/init_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/init_64-xen.c 2008-12-01 11:32:38.000000000 +0100
-@@ -1129,14 +1129,15 @@ static __init int x8664_sysctl_init(void
+--- sle11-2009-05-14.orig/arch/x86/mm/init_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/init_64-xen.c 2008-12-15 11:26:44.000000000 +0100
+@@ -1127,14 +1127,15 @@ static __init int x8664_sysctl_init(void
__initcall(x8664_sysctl_init);
#endif
};
struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-Index: head-2008-12-01/arch/x86/mm/pageattr_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/pageattr_64-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/pageattr_64-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/pageattr_64-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -330,34 +330,40 @@ static struct page *split_large_page(uns
return base;
}
}
}
-Index: head-2008-12-01/drivers/pci/msi-xen.c
-===================================================================
---- head-2008-12-01.orig/drivers/pci/msi-xen.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/pci/msi-xen.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/pci/msi-xen.c 2009-04-24 13:31:56.000000000 +0200
++++ sle11-2009-05-14/drivers/pci/msi-xen.c 2008-12-15 11:26:44.000000000 +0100
@@ -263,10 +263,8 @@ void disable_msi_mode(struct pci_dev *de
pci_write_config_word(dev, msi_control_reg(pos), control);
dev->msix_enabled = 0;
}
#ifdef CONFIG_PM
-Index: head-2008-12-01/drivers/xen/balloon/balloon.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/balloon/balloon.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/balloon/balloon.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/balloon/balloon.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/balloon/balloon.c 2008-12-15 11:26:44.000000000 +0100
@@ -97,8 +97,8 @@ extern unsigned long totalhigh_pages;
static LIST_HEAD(ballooned_pages);
{
int need_sleep = 0;
long credit;
-Index: head-2008-12-01/drivers/xen/blkback/blkback.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkback/blkback.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blkback/blkback.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blkback/blkback.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkback/blkback.c 2008-12-15 11:26:44.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/spinlock.h>
#include <linux/list.h>
#include <linux/delay.h>
#include <xen/balloon.h>
-Index: head-2008-12-01/drivers/xen/blkback/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkback/interface.c 2007-06-12 13:13:44.000000000 +0200
-+++ head-2008-12-01/drivers/xen/blkback/interface.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blkback/interface.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/blkback/interface.c 2008-12-15 11:26:44.000000000 +0100
@@ -34,7 +34,7 @@
#include <xen/evtchn.h>
#include <linux/kthread.h>
blkif_t *blkif_alloc(domid_t domid)
{
-Index: head-2008-12-01/drivers/xen/blkfront/blkfront.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkfront/blkfront.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blkfront/blkfront.c 2008-12-01 11:32:38.000000000 +0100
-@@ -70,7 +70,7 @@ static int setup_blkring(struct xenbus_d
+--- sle11-2009-05-14.orig/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:16.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:27.000000000 +0100
+@@ -71,7 +71,7 @@ static int setup_blkring(struct xenbus_d
static void kick_pending_request_queues(struct blkfront_info *);
static irqreturn_t blkif_int(int irq, void *dev_id);
static void blkif_recover(struct blkfront_info *);
static void blkif_completion(struct blk_shadow *);
static void blkif_free(struct blkfront_info *, int);
-@@ -110,7 +110,7 @@ static int blkfront_probe(struct xenbus_
+@@ -111,7 +111,7 @@ static int blkfront_probe(struct xenbus_
info->xbdev = dev;
info->vdevice = vdevice;
info->connected = BLKIF_STATE_DISCONNECTED;
for (i = 0; i < BLK_RING_SIZE; i++)
info->shadow[i].req.id = i+1;
-@@ -459,9 +459,9 @@ static void kick_pending_request_queues(
+@@ -462,9 +462,9 @@ static void kick_pending_request_queues(
}
}
spin_lock_irq(&blkif_io_lock);
if (info->connected == BLKIF_STATE_CONNECTED)
kick_pending_request_queues(info);
-Index: head-2008-12-01/drivers/xen/blktap/blktap.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blktap/blktap.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blktap/blktap.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blktap/blktap.c 2009-04-20 11:37:34.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/blktap/blktap.c 2009-04-20 11:37:50.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/spinlock.h>
#include <linux/list.h>
#include <asm/hypervisor.h>
#include "common.h"
-Index: head-2008-12-01/drivers/xen/blktap/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blktap/interface.c 2008-09-15 13:40:15.000000000 +0200
-+++ head-2008-12-01/drivers/xen/blktap/interface.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blktap/interface.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/blktap/interface.c 2008-12-15 11:26:44.000000000 +0100
@@ -34,7 +34,7 @@
#include "common.h"
#include <xen/evtchn.h>
blkif_t *tap_alloc_blkif(domid_t domid)
{
-Index: head-2008-12-01/drivers/xen/char/mem.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/char/mem.c 2007-08-06 15:10:49.000000000 +0200
-+++ head-2008-12-01/drivers/xen/char/mem.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/char/mem.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/char/mem.c 2008-12-15 11:26:44.000000000 +0100
@@ -157,7 +157,7 @@ static loff_t memory_lseek(struct file *
{
loff_t ret;
return ret;
}
-Index: head-2008-12-01/drivers/xen/console/console.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/console/console.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/console/console.c 2008-12-01 11:32:38.000000000 +0100
-@@ -80,11 +80,6 @@ static int xc_num = -1;
- #define XEN_XVC_MAJOR 204
- #define XEN_XVC_MINOR 191
+--- sle11-2009-05-14.orig/drivers/xen/console/console.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/console/console.c 2008-12-15 11:26:44.000000000 +0100
+@@ -85,11 +85,6 @@ static int xc_num = -1;
+ #define XEN_HVC_MAJOR 229
+ #define XEN_HVC_MINOR 0
-#ifdef CONFIG_MAGIC_SYSRQ
-static unsigned long sysrq_requested;
static int __init xencons_setup(char *str)
{
char *q;
-@@ -339,8 +334,8 @@ void __init dom0_init_screen_info(const
+@@ -355,8 +350,8 @@ void __init dom0_init_screen_info(const
#define DUMMY_TTY(_tty) ((xc_mode == XC_TTY) && \
((_tty)->index != (xc_num - 1)))
static struct tty_struct *xencons_tty;
static int xencons_priv_irq;
static char x_char;
-@@ -356,7 +351,9 @@ void xencons_rx(char *buf, unsigned len)
+@@ -372,7 +367,9 @@ void xencons_rx(char *buf, unsigned len)
for (i = 0; i < len; i++) {
#ifdef CONFIG_MAGIC_SYSRQ
if (buf[i] == '\x0f') { /* ^O */
if (!sysrq_requested) {
sysrq_requested = jiffies;
-Index: head-2008-12-01/drivers/xen/core/reboot.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/core/reboot.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/core/reboot.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/core/reboot.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/core/reboot.c 2008-12-15 11:26:44.000000000 +0100
@@ -34,8 +34,8 @@ static int suspend_cancelled;
/* Can we leave APs online when we suspend? */
static int fast_suspend;
{
int err;
-Index: head-2008-12-01/drivers/xen/core/smpboot.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/core/smpboot.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/core/smpboot.c 2008-12-01 11:32:38.000000000 +0100
-@@ -165,7 +165,12 @@ static void xen_smp_intr_exit(unsigned i
+--- sle11-2009-05-14.orig/drivers/xen/core/smpboot.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/core/smpboot.c 2008-12-15 11:26:44.000000000 +0100
+@@ -161,7 +161,12 @@ static void xen_smp_intr_exit(unsigned i
void __cpuinit cpu_bringup(void)
{
identify_cpu(cpu_data + smp_processor_id());
touch_softlockup_watchdog();
preempt_disable();
-@@ -304,11 +309,12 @@ void __init smp_prepare_cpus(unsigned in
+@@ -300,11 +305,12 @@ void __init smp_prepare_cpus(unsigned in
if (cpu == 0)
continue;
gdt_descr->address = get_zeroed_page(GFP_KERNEL);
if (unlikely(!gdt_descr->address)) {
printk(KERN_CRIT "CPU%d failed to allocate GDT\n",
-@@ -317,6 +323,11 @@ void __init smp_prepare_cpus(unsigned in
+@@ -313,6 +319,11 @@ void __init smp_prepare_cpus(unsigned in
}
gdt_descr->size = GDT_SIZE;
memcpy((void *)gdt_descr->address, cpu_gdt_table, GDT_SIZE);
make_page_readonly(
(void *)gdt_descr->address,
XENFEAT_writable_descriptor_tables);
-@@ -336,10 +347,6 @@ void __init smp_prepare_cpus(unsigned in
+@@ -332,10 +343,6 @@ void __init smp_prepare_cpus(unsigned in
cpu_2_logical_apicid[cpu] = apicid;
x86_cpu_to_apicid[cpu] = apicid;
#ifdef __x86_64__
cpu_pda(cpu)->pcurrent = idle;
cpu_pda(cpu)->cpunumber = cpu;
-Index: head-2008-12-01/drivers/xen/fbfront/xenfb.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/fbfront/xenfb.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/fbfront/xenfb.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/fbfront/xenfb.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/fbfront/xenfb.c 2008-12-15 11:26:44.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <asm/hypervisor.h>
#include <xen/evtchn.h>
#include <xen/interface/io/fbif.h>
-Index: head-2008-12-01/drivers/xen/netback/loopback.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/netback/loopback.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/netback/loopback.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/netback/loopback.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/netback/loopback.c 2008-12-15 11:26:44.000000000 +0100
@@ -54,6 +54,7 @@
#include <net/dst.h>
#include <net/xfrm.h> /* secpath_reset() */
static int nloopbacks = -1;
module_param(nloopbacks, int, 0);
-Index: head-2008-12-01/drivers/xen/pciback/conf_space_header.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/pciback/conf_space_header.c 2008-10-29 09:55:56.000000000 +0100
-+++ head-2008-12-01/drivers/xen/pciback/conf_space_header.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/pciback/conf_space_header.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/pciback/conf_space_header.c 2008-12-15 11:26:44.000000000 +0100
@@ -22,14 +22,14 @@ static int command_write(struct pci_dev
{
int err;
if (unlikely(verbose_request))
printk(KERN_DEBUG "pciback: %s: disable\n",
pci_name(dev));
-Index: head-2008-12-01/drivers/xen/pciback/pciback.h
-===================================================================
---- head-2008-12-01.orig/drivers/xen/pciback/pciback.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/pciback/pciback.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/pciback/pciback.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/pciback/pciback.h 2008-12-15 11:26:44.000000000 +0100
@@ -88,7 +88,7 @@ void pciback_release_devices(struct pcib
/* Handles events from front-end */
int pciback_xenbus_register(void);
void pciback_xenbus_unregister(void);
-Index: head-2008-12-01/drivers/xen/pciback/pciback_ops.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/pciback/pciback_ops.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/pciback/pciback_ops.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/pciback/pciback_ops.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/pciback/pciback_ops.c 2008-12-15 11:26:44.000000000 +0100
@@ -25,7 +25,7 @@ void pciback_reset_device(struct pci_dev
pci_write_config_word(dev, PCI_COMMAND, 0);
struct pci_dev *dev;
struct xen_pci_op *op = &pdev->sh_info->op;
-Index: head-2008-12-01/drivers/xen/pciback/xenbus.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/pciback/xenbus.c 2008-07-21 11:00:33.000000000 +0200
-+++ head-2008-12-01/drivers/xen/pciback/xenbus.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/pciback/xenbus.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/pciback/xenbus.c 2008-12-15 11:26:44.000000000 +0100
@@ -32,7 +32,7 @@ static struct pciback_device *alloc_pdev
pdev->evtchn_irq = INVALID_EVTCHN_IRQ;
pdev->be_watching = 0;
flush_scheduled_work();
if (pdev->sh_info != NULL) {
-Index: head-2008-12-01/drivers/xen/scsiback/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/scsiback/interface.c 2008-07-21 11:00:33.000000000 +0200
-+++ head-2008-12-01/drivers/xen/scsiback/interface.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/scsiback/interface.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/scsiback/interface.c 2008-12-15 11:26:44.000000000 +0100
@@ -39,7 +39,7 @@
#include <linux/kthread.h>
struct vscsibk_info *vscsibk_info_alloc(domid_t domid)
{
-Index: head-2008-12-01/drivers/xen/scsiback/scsiback.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/scsiback/scsiback.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/scsiback/scsiback.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/scsiback/scsiback.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/scsiback/scsiback.c 2008-12-15 11:26:44.000000000 +0100
@@ -322,13 +322,11 @@ static int scsiback_merge_bio(struct req
if (!rq->bio)
}
return 0;
-Index: head-2008-12-01/drivers/xen/sfc_netfront/accel_vi.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/sfc_netfront/accel_vi.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/sfc_netfront/accel_vi.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/sfc_netfront/accel_vi.c 2009-03-30 16:35:11.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/sfc_netfront/accel_vi.c 2009-03-30 16:35:25.000000000 +0200
@@ -463,7 +463,7 @@ netfront_accel_enqueue_skb_multi(netfron
if (skb->ip_summed == CHECKSUM_PARTIAL) {
}
NETFRONT_ACCEL_PKTBUFF_FOR_EACH_FRAGMENT
(skb, idx, frag_data, frag_len, {
-Index: head-2008-12-01/drivers/xen/tpmback/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/tpmback/interface.c 2008-01-21 11:15:26.000000000 +0100
-+++ head-2008-12-01/drivers/xen/tpmback/interface.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/tpmback/interface.c 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/tpmback/interface.c 2008-12-15 11:26:44.000000000 +0100
@@ -15,7 +15,7 @@
#include <xen/balloon.h>
#include <xen/gnttab.h>
int num_frontends = 0;
LIST_HEAD(tpmif_list);
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_comms.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_comms.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_comms.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_comms.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_comms.c 2008-12-15 11:26:44.000000000 +0100
@@ -49,9 +49,9 @@
static int xenbus_irq;
static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_probe.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_probe.c 2008-12-01 11:22:58.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_probe.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.c 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.c 2008-12-15 11:26:44.000000000 +0100
@@ -843,7 +843,7 @@ void unregister_xenstore_notifier(struct
EXPORT_SYMBOL_GPL(unregister_xenstore_notifier);
{
BUG_ON((xenstored_ready <= 0));
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/desc_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/desc_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/desc_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/desc_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/desc_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -4,8 +4,6 @@
#include <asm/ldt.h>
#include <asm/segment.h>
#endif /* !__ASSEMBLY__ */
#endif
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/dma-mapping_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2008-04-02 12:34:02.000000000 +0200
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -127,10 +127,10 @@ dma_get_cache_alignment(void)
return (1 << INTERNODE_CACHE_SHIFT);
}
enum dma_data_direction direction)
{
flush_write_buffers();
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/fixmap_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/fixmap_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/fixmap_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/fixmap_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/fixmap_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -13,13 +13,16 @@
#ifndef _ASM_FIXMAP_H
#define _ASM_FIXMAP_H
#ifndef __ASSEMBLY__
#include <linux/kernel.h>
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/highmem.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/highmem.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/highmem.h 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/highmem.h 2008-12-15 11:26:44.000000000 +0100
@@ -85,7 +85,7 @@ static inline void clear_user_highpage(s
void copy_highpage(struct page *to, struct page *from);
{
copy_highpage(to, from);
}
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/hypervisor.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-15 11:26:44.000000000 +0100
@@ -46,15 +46,6 @@
#include <asm/percpu.h>
#include <asm/ptrace.h>
extern shared_info_t *HYPERVISOR_shared_info;
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/io_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/io_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/io_32.h 2008-12-01 11:32:38.000000000 +0100
-@@ -269,11 +269,7 @@ static inline void flush_write_buffers(v
-
- #endif /* __KERNEL__ */
-
--#ifdef SLOW_IO_BY_JUMPING
--#define __SLOW_DOWN_IO "jmp 1f; 1: jmp 1f; 1:"
--#else
- #define __SLOW_DOWN_IO "outb %%al,$0x80;"
--#endif
-
- static inline void slow_down_io(void) {
- __asm__ __volatile__(
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/irqflags_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/irqflags_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/irqflags_32.h 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/irqflags_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -22,9 +22,6 @@
#define __raw_local_save_flags() (current_vcpu_info()->evtchn_upcall_mask)
#endif /* __ASSEMBLY__ */
/*
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/mmu_context_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -27,14 +27,13 @@ static inline void enter_lazy_tlb(struct
static inline void __prepare_arch_switch(void)
{
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable-3level.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgtable-3level.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable-3level.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable-3level.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable-3level.h 2008-12-15 11:26:44.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_3LEVEL_H
#define _I386_PGTABLE_3LEVEL_H
#define __pte_mfn(_pte) (((_pte).pte_low >> PAGE_SHIFT) | \
((_pte).pte_high << (32-PAGE_SHIFT)))
#define pte_mfn(_pte) ((_pte).pte_low & _PAGE_PRESENT ? \
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -38,14 +38,14 @@ struct vm_area_struct;
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
extern unsigned long empty_zero_page[1024];
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define ptep_get_and_clear_full(mm, addr, ptep, full) \
((full) ? ({ \
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/processor_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/threads.h>
#include <asm/percpu.h>
+extern void secondary_cpu_init(void);
+
#endif /* __ASM_I386_PROCESSOR_H */
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/segment_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/segment_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -39,7 +39,7 @@
* 25 - APM BIOS support
*
#define GDT_ENTRY_DOUBLEFAULT_TSS 31
/*
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/smp_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -8,6 +8,7 @@
#include <linux/kernel.h>
#include <linux/threads.h>
extern cpumask_t cpu_possible_map;
#define cpu_callin_map cpu_possible_map
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/system_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/system_32.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/system_32.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/system_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/system_32.h 2008-12-15 11:26:44.000000000 +0100
@@ -139,17 +139,17 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t"
#define write_cr4(x) \
__asm__ __volatile__("movl %0,%%cr4": :"r" (x))
static inline unsigned long get_limit(unsigned long segment)
{
unsigned long __limit;
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/desc_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/desc_64.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/desc_64.h 2009-05-14 11:02:41.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/desc_64.h 2008-12-15 11:26:44.000000000 +0100
@@ -9,62 +9,11 @@
#include <linux/string.h>
extern struct desc_ptr idt_descr, cpu_gdt_descr[NR_CPUS];
extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/dma-mapping_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-15 11:26:44.000000000 +0100
@@ -64,6 +64,9 @@ static inline int dma_mapping_error(dma_
return (dma_addr == bad_dma_address);
}
{
flush_write_buffers();
}
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-01 11:32:38.000000000 +0100
-@@ -235,19 +235,18 @@ extern unsigned int __kernel_page_user;
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-15 11:26:44.000000000 +0100
+@@ -237,19 +237,18 @@ extern unsigned int __kernel_page_user;
static inline unsigned long pgd_bad(pgd_t pgd)
{
#define set_pte_at(_mm,addr,ptep,pteval) do { \
if (((_mm) != current->mm && (_mm) != &init_mm) || \
-@@ -402,8 +401,6 @@ static inline int pmd_large(pmd_t pte) {
+@@ -404,8 +403,6 @@ static inline int pmd_large(pmd_t pte) {
#define pmd_present(x) (__pmd_val(x) & _PAGE_PRESENT)
#endif
#define pmd_clear(xp) do { set_pmd(xp, __pmd(0)); } while (0)
#define pfn_pmd(nr,prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val(prot)))
#define pmd_pfn(x) ((pmd_val(x) & __PHYSICAL_MASK) >> PAGE_SHIFT)
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/processor_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/processor_64.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/processor_64.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_64.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_64.h 2008-12-15 11:26:44.000000000 +0100
@@ -484,6 +484,14 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
}
extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
#define stack_current() \
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/smp_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_64.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-15 11:26:44.000000000 +0100
@@ -88,11 +88,6 @@ extern u8 x86_cpu_to_log_apicid[NR_CPUS]
extern u8 bios_cpu_apicid[];
#endif /* !CONFIG_SMP */
#endif
-Index: head-2008-12-01/kernel/kexec.c
-===================================================================
---- head-2008-12-01.orig/kernel/kexec.c 2008-12-01 11:23:01.000000000 +0100
-+++ head-2008-12-01/kernel/kexec.c 2008-12-01 11:32:38.000000000 +0100
-@@ -372,7 +372,7 @@ static struct page *kimage_alloc_pages(g
+--- sle11-2009-05-14.orig/kernel/kexec.c 2009-02-17 11:27:16.000000000 +0100
++++ sle11-2009-05-14/kernel/kexec.c 2009-02-17 11:34:22.000000000 +0100
+@@ -374,7 +374,7 @@ static struct page *kimage_alloc_pages(g
if (limit == ~0UL)
address_bits = BITS_PER_LONG;
else
if (xen_limit_pages_to_max_mfn(pages, order, address_bits) < 0) {
__free_pages(pages, order);
-Index: head-2008-12-01/net/core/dev.c
-===================================================================
---- head-2008-12-01.orig/net/core/dev.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/net/core/dev.c 2008-12-01 11:32:38.000000000 +0100
+--- sle11-2009-05-14.orig/net/core/dev.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/net/core/dev.c 2008-12-15 11:26:44.000000000 +0100
@@ -1751,10 +1751,10 @@ inline int skb_checksum_setup(struct sk_
goto out;
switch (skb->nh.iph->protocol) {
projects / people / teissler / ipfire-2.x.git / blobdiff