Acked-by: jbeulich@novell.com
---- sle11-2009-05-14.orig/arch/x86/Kconfig 2009-02-05 10:22:19.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/Kconfig 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/Kconfig 2009-02-05 10:22:19.000000000 +0100
++++ sle11-2009-10-16/arch/x86/Kconfig 2009-03-04 11:25:55.000000000 +0100
@@ -50,13 +50,15 @@ config GENERIC_CMOS_UPDATE
config CLOCKSOURCE_WATCHDOG
config LOCKDEP_SUPPORT
def_bool y
---- sle11-2009-05-14.orig/arch/x86/kernel/Makefile 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/Makefile 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/Makefile 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/Makefile 2009-03-04 11:25:55.000000000 +0100
@@ -124,7 +124,7 @@ ifeq ($(CONFIG_X86_64),y)
pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
endif
+ smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- sle11-2009-05-14.orig/arch/x86/kernel/apic_32-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/apic_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/apic_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/apic_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -25,6 +25,8 @@
#include <linux/kernel_stat.h>
#include <linux/sysdev.h>
int setup_profiling_timer(unsigned int multiplier)
{
return -EINVAL;
---- sle11-2009-05-14.orig/arch/x86/kernel/cpu/common-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/cpu/common-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/cpu/common-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/cpu/common-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -610,7 +610,7 @@ void __init early_cpu_init(void)
struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
{
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- sle11-2009-05-14.orig/arch/x86/kernel/e820_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/e820_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/e820_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/e820_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -14,6 +14,7 @@
#include <asm/pgtable.h>
#include <asm/page.h>
return sum == 0;
}
---- sle11-2009-05-14.orig/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:08:06.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:09:56.000000000 +0200
+--- sle11-2009-10-16.orig/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:08:06.000000000 +0200
++++ sle11-2009-10-16/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:09:56.000000000 +0200
@@ -30,7 +30,7 @@
* 18(%esp) - %eax
* 1C(%esp) - %ds
ENTRY(kernel_thread_helper)
pushl $0 # fake return address for unwinder
---- sle11-2009-05-14.orig/arch/x86/kernel/head_32-xen.S 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/head_32-xen.S 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/head_32-xen.S 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/head_32-xen.S 2009-03-04 11:25:55.000000000 +0100
@@ -27,6 +27,7 @@
#define X86_CAPABILITY new_cpu_data+CPUINFO_x86_capability
#define X86_VENDOR_ID new_cpu_data+CPUINFO_x86_vendor_id
/* get the PDA pointer */
movl $boot_pda, %eax
---- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/io_apic_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/io_apic_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/io_apic_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -167,7 +167,7 @@ static inline void io_apic_write(unsigne
*/
static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- sle11-2009-05-14.orig/arch/x86/kernel/irq_32-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/irq_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/irq_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/irq_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -10,7 +10,6 @@
* io_apic.c.)
*/
#ifdef CONFIG_4KSTACKS
/*
---- sle11-2009-05-14.orig/arch/x86/kernel/microcode-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/microcode-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/microcode-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/microcode-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -108,7 +108,7 @@ static ssize_t microcode_write (struct f
return ret;
}
.owner = THIS_MODULE,
.write = microcode_write,
.open = microcode_open,
---- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/mpparse_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/mpparse_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/mpparse_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -1079,7 +1079,7 @@ int mp_register_gsi(u32 gsi, int trigger
static int gsi_to_irq[MAX_GSI_NUM];
gsi = pci_irq++;
gsi_to_irq[irq] = gsi;
} else {
---- sle11-2009-05-14.orig/arch/x86/kernel/pci-dma-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/pci-dma-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/pci-dma-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/pci-dma-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -311,7 +311,7 @@ int dma_declare_coherent_memory(struct d
return DMA_MEMORY_IO;
out:
if (mem_base)
iounmap(mem_base);
---- sle11-2009-05-14.orig/arch/x86/kernel/pcspeaker.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/pcspeaker.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/pcspeaker.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/pcspeaker.c 2009-03-04 11:25:55.000000000 +0100
@@ -7,6 +7,11 @@ static __init int add_pcspkr(void)
struct platform_device *pd;
int ret;
pd = platform_device_alloc("pcspkr", -1);
if (!pd)
return -ENOMEM;
---- sle11-2009-05-14.orig/arch/x86/kernel/process_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/process_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/process_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/process_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/ptrace.h>
#include <linux/random.h>
return prev_p;
}
---- sle11-2009-05-14.orig/arch/x86/kernel/setup_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/setup_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/setup_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/setup_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -33,7 +33,6 @@
#include <linux/initrd.h>
#include <linux/bootmem.h>
- * c-basic-offset:8
- * End:
- */
---- sle11-2009-05-14.orig/arch/x86/kernel/smp_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/smp_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/smp_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/smp_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -335,8 +335,7 @@ static void flush_tlb_others(cpumask_t c
/*
* i'm not happy about this global shared spinlock in the
flush_mm = NULL;
flush_va = 0;
---- sle11-2009-05-14.orig/arch/x86/kernel/time_32-xen.c 2009-03-24 10:08:30.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/time_32-xen.c 2009-03-24 10:11:08.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/time_32-xen.c 2009-10-28 14:57:31.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/time_32-xen.c 2009-10-28 14:57:40.000000000 +0100
@@ -51,6 +51,7 @@
#include <linux/kernel_stat.h>
#include <linux/posix-timers.h>
/* Return address is either directly at stack pointer
or above a saved eflags. Eflags has bits 22-31 zero,
kernel addresses don't. */
-@@ -761,19 +594,6 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -762,19 +595,6 @@ irqreturn_t timer_interrupt(int irq, voi
return IRQ_HANDLED;
}
void mark_tsc_unstable(void)
{
#ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */
-@@ -829,21 +649,9 @@ static struct clocksource clocksource_xe
+@@ -830,21 +650,9 @@ static struct clocksource clocksource_xe
.mask = CLOCKSOURCE_MASK(64),
.mult = 1 << XEN_SHIFT, /* time directly in nanoseconds */
.shift = XEN_SHIFT,
static void init_missing_ticks_accounting(unsigned int cpu)
{
struct vcpu_register_runstate_memory_area area;
-@@ -864,7 +672,7 @@ static void init_missing_ticks_accountin
+@@ -865,7 +673,7 @@ static void init_missing_ticks_accountin
}
/* not static: needed by APM */
{
unsigned long retval;
unsigned long flags;
-@@ -877,11 +685,11 @@ unsigned long get_cmos_time(void)
+@@ -878,11 +686,11 @@ unsigned long get_cmos_time(void)
return retval;
}
static void sync_cmos_clock(unsigned long dummy)
{
-@@ -925,7 +733,8 @@ static void sync_cmos_clock(unsigned lon
+@@ -926,7 +734,8 @@ static void sync_cmos_clock(unsigned lon
void notify_arch_cmos_timer(void)
{
mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
}
-@@ -958,29 +767,11 @@ static int time_init_device(void)
+@@ -959,29 +768,11 @@ static int time_init_device(void)
device_initcall(time_init_device);
static void setup_cpu0_timer_irq(void)
{
per_cpu(timer_irq, 0) =
-@@ -988,7 +779,7 @@ static void setup_cpu0_timer_irq(void)
+@@ -989,7 +780,7 @@ static void setup_cpu0_timer_irq(void)
VIRQ_TIMER,
0,
timer_interrupt,
"timer0",
NULL);
BUG_ON(per_cpu(timer_irq, 0) < 0);
-@@ -1000,16 +791,9 @@ static struct vcpu_set_periodic_timer xe
+@@ -1001,16 +792,9 @@ static struct vcpu_set_periodic_timer xe
void __init time_init(void)
{
switch (HYPERVISOR_vcpu_op(VCPUOP_set_periodic_timer, 0,
&xen_set_periodic_tick)) {
-@@ -1028,18 +812,12 @@ void __init time_init(void)
+@@ -1029,18 +813,12 @@ void __init time_init(void)
per_cpu(processed_system_time, 0) = processed_system_time;
init_missing_ticks_accounting(0);
#endif
/* Cannot request_irq() until kmem is initialised. */
-@@ -1196,7 +974,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -1197,7 +975,7 @@ int __cpuinit local_setup_timer(unsigned
irq = bind_virq_to_irqhandler(VIRQ_TIMER,
cpu,
timer_interrupt,
timer_name[cpu],
NULL);
if (irq < 0)
-@@ -1285,7 +1063,7 @@ static ctl_table xen_table[] = {
+@@ -1286,7 +1064,7 @@ static ctl_table xen_table[] = {
};
static int __init xen_sysctl_init(void)
{
return 0;
}
__initcall(xen_sysctl_init);
---- sle11-2009-05-14.orig/arch/x86/kernel/traps_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/traps_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/traps_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/traps_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -100,6 +100,7 @@ asmlinkage void fixup_4gb_segment(void);
asmlinkage void machine_check(void);
+ return 1;
+}
+__setup("code_bytes=", code_bytes_setup);
---- sle11-2009-05-14.orig/arch/x86/mm/fault_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/fault_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/fault_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/fault_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -46,43 +46,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
return;
/* It's safe to allow irq's after cr2 has been saved and the vmalloc
---- sle11-2009-05-14.orig/arch/x86/mm/highmem_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/highmem_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/highmem_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/highmem_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -33,14 +33,16 @@ static void *__kmap_atomic(struct page *
/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
return (void*) vaddr;
}
---- sle11-2009-05-14.orig/arch/x86/mm/init_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/init_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/init_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/init_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -66,6 +66,7 @@ static pmd_t * __init one_md_table_init(
#ifdef CONFIG_X86_PAE
make_lowmem_page_readonly(page_table,
XENFEAT_writable_page_tables);
set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
---- sle11-2009-05-14.orig/arch/x86/mm/pgtable_32-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/pgtable_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/pgtable_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/pgtable_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -149,6 +149,8 @@ void __set_fixmap (enum fixed_addresses
void __init reserve_top_address(unsigned long reserve)
{
kmem_cache_free(pmd_cache, pmd);
}
---- sle11-2009-05-14.orig/arch/x86/ia32/ia32entry-xen.S 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/ia32/ia32entry-xen.S 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/ia32/ia32entry-xen.S 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/arch/x86/ia32/ia32entry-xen.S 2009-03-04 11:25:55.000000000 +0100
@@ -465,7 +465,7 @@ ia32_sys_call_table:
.quad sys32_vm86_warning /* vm86old */
.quad compat_sys_wait4
.quad sys_getcpu
+ .quad sys_epoll_pwait
ia32_syscall_end:
---- sle11-2009-05-14.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/acpi/sleep_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/acpi/sleep_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -59,7 +59,7 @@ unsigned long acpi_wakeup_address = 0;
unsigned long acpi_video_flags;
extern char wakeup_start, wakeup_end;
local_flush_tlb();
}
#endif
---- sle11-2009-05-14.orig/arch/x86/kernel/e820_64-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/e820_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/e820_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/e820_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -88,6 +88,13 @@ static inline int bad_addr(unsigned long
return 1;
}
{
if (userdef) {
printk(KERN_INFO "user-defined physical RAM map:\n");
---- sle11-2009-05-14.orig/arch/x86/kernel/entry_64-xen.S 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/entry_64-xen.S 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/entry_64-xen.S 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/entry_64-xen.S 2009-03-04 11:25:55.000000000 +0100
@@ -629,6 +629,9 @@ END(invalidate_interrupt\num)
ENTRY(call_function_interrupt)
apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
#endif
ENTRY(apic_timer_interrupt)
---- sle11-2009-05-14.orig/arch/x86/kernel/genapic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/genapic_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/genapic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/genapic_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -65,8 +65,8 @@ void __init clustered_apic_check(void)
* Some x86_64 machines use physical APIC mode regardless of how many
* procs/clusters are present (x86_64 ES7000 is an example).
genapic = &apic_cluster;
goto print;
}
---- sle11-2009-05-14.orig/arch/x86/kernel/head64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/head64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/head64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/head64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -45,8 +45,6 @@ static void __init clear_bss(void)
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022
#endif
}
---- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/io_apic_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/io_apic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/io_apic_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -36,6 +36,7 @@
#include <acpi/acpi_bus.h>
#endif
else
set_ioapic_affinity_irq(irq, TARGET_CPUS);
}
---- sle11-2009-05-14.orig/arch/x86/kernel/irq_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/irq_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/irq_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/irq_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -18,6 +18,7 @@
#include <asm/uaccess.h>
#include <asm/io_apic.h>
/*irq_exit();*/
---- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/mpparse_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/mpparse_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/mpparse_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -60,9 +60,9 @@ unsigned long mp_lapic_addr = 0;
/* Processor that is doing the boot up */
unsigned int boot_cpu_id = -1U;
return gsi;
ioapic = mp_find_ioapic(gsi);
---- sle11-2009-05-14.orig/arch/x86/kernel/process_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/process_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/process_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/process_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -338,14 +338,17 @@ void load_gs_index(unsigned gs)
void flush_thread(void)
{
tsk->thread.debugreg0 = 0;
tsk->thread.debugreg1 = 0;
---- sle11-2009-05-14.orig/arch/x86/kernel/setup_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/setup_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/setup_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/setup_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -141,7 +141,7 @@ EXPORT_SYMBOL_GPL(edid_info);
extern int root_mountflags;
-}
-device_initcall(add_pcspkr);
-#endif
---- sle11-2009-05-14.orig/arch/x86/kernel/vsyscall_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/vsyscall_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/vsyscall_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/vsyscall_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/seqlock.h>
#include <linux/jiffies.h>
#endif
on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
hotcpu_notifier(cpu_vsyscall_notifier, 0);
---- sle11-2009-05-14.orig/arch/x86/mm/fault_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/fault_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/fault_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/fault_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -56,38 +56,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
return;
if (likely(regs->eflags & X86_EFLAGS_IF))
---- sle11-2009-05-14.orig/arch/x86/mm/init_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/init_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/init_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/init_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -1108,20 +1108,30 @@ int kern_addr_valid(unsigned long addr)
extern int exception_trace, page_fault_trace;
return 0;
}
__initcall(x8664_sysctl_init);
---- sle11-2009-05-14.orig/arch/x86/mm/pageattr_64-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/pageattr_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/pageattr_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/pageattr_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -350,8 +350,8 @@ static void flush_kernel_map(void *arg)
void *adr = page_address(pg);
if (cpu_has_clflush)
large_pte = pte_mkhuge(large_pte);
set_pte((pte_t *)pmd, large_pte);
}
---- sle11-2009-05-14.orig/drivers/acpi/processor_extcntl.c 2009-02-16 15:58:14.000000000 +0100
-+++ sle11-2009-05-14/drivers/acpi/processor_extcntl.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/acpi/processor_extcntl.c 2009-08-26 11:52:33.000000000 +0200
++++ sle11-2009-10-16/drivers/acpi/processor_extcntl.c 2009-03-04 11:25:55.000000000 +0100
@@ -32,9 +32,8 @@
#define ACPI_PROCESSOR_COMPONENT 0x01000000
if (ACPI_FAILURE(status))
return status;
---- sle11-2009-05-14.orig/drivers/char/tpm/tpm_xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/char/tpm/tpm_xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/char/tpm/tpm_xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/drivers/char/tpm/tpm_xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -481,7 +481,6 @@ static struct xenbus_device_id tpmfront_
static struct xenbus_driver tpmfront = {
}
static int tpmif_allocate_tx_buffers(struct tpm_private *tp)
---- sle11-2009-05-14.orig/drivers/pci/msi-xen.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/drivers/pci/msi-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/pci/msi-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/pci/msi-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -44,6 +44,36 @@ struct msi_pirq_entry {
int entry_nr;
};
}
/**
---- sle11-2009-05-14.orig/drivers/xen/balloon/sysfs.c 2008-11-25 13:31:07.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/balloon/sysfs.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/balloon/sysfs.c 2009-06-29 15:24:00.000000000 +0200
++++ sle11-2009-10-16/drivers/xen/balloon/sysfs.c 2009-03-04 11:25:55.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/stat.h>
#include <linux/string.h>
#include "common.h"
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- sle11-2009-05-14.orig/drivers/xen/blkback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/blkback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/blkback/xenbus.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/blkback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -527,7 +527,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blkback = {
+ if (xenbus_register_backend(&blkback))
+ BUG();
}
---- sle11-2009-05-14.orig/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:27.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:49.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:27.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:49.000000000 +0100
@@ -902,7 +902,6 @@ MODULE_ALIAS("xen:vbd");
static struct xenbus_driver blkfront = {
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- sle11-2009-05-14.orig/drivers/xen/blktap/xenbus.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/blktap/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/blktap/xenbus.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/blktap/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -465,7 +465,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blktap = {
+ if (xenbus_register_backend(&blktap))
+ BUG();
}
---- sle11-2009-05-14.orig/drivers/xen/core/evtchn.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/core/evtchn.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/core/evtchn.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/core/evtchn.c 2009-03-04 11:25:55.000000000 +0100
@@ -145,7 +145,7 @@ static void bind_evtchn_to_cpu(unsigned
BUG_ON(!test_bit(chn, s->evtchn_mask));
.mask = mask_dynirq,
.unmask = unmask_dynirq,
.mask_ack = ack_dynirq,
---- sle11-2009-05-14.orig/drivers/xen/core/smpboot.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/core/smpboot.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/core/smpboot.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/core/smpboot.c 2009-03-04 11:25:55.000000000 +0100
@@ -117,7 +117,7 @@ static int __cpuinit xen_smp_intr_init(u
rc = bind_ipi_to_irqhandler(RESCHEDULE_VECTOR,
cpu,
cpu_data[cpu] = boot_cpu_data;
cpu_data[cpu].apicid = apicid;
---- sle11-2009-05-14.orig/drivers/xen/fbfront/xenfb.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/fbfront/xenfb.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/fbfront/xenfb.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/fbfront/xenfb.c 2009-03-04 11:25:55.000000000 +0100
@@ -857,7 +857,6 @@ MODULE_ALIAS("xen:vfb");
static struct xenbus_driver xenfb_driver = {
.ids = xenfb_ids,
.probe = xenfb_probe,
.remove = xenfb_remove,
---- sle11-2009-05-14.orig/drivers/xen/fbfront/xenkbd.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/fbfront/xenkbd.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/fbfront/xenkbd.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/fbfront/xenkbd.c 2009-03-04 11:25:55.000000000 +0100
@@ -323,7 +323,6 @@ MODULE_ALIAS("xen:vkbd");
static struct xenbus_driver xenkbd_driver = {
.ids = xenkbd_ids,
.probe = xenkbd_probe,
.remove = xenkbd_remove,
---- sle11-2009-05-14.orig/drivers/xen/netback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/netback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/netback/xenbus.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/netback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -439,7 +439,6 @@ static const struct xenbus_device_id net
static struct xenbus_driver netback = {
+ if (xenbus_register_backend(&netback))
+ BUG();
}
---- sle11-2009-05-14.orig/drivers/xen/netfront/netfront.c 2009-03-30 16:34:59.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/netfront/netfront.c 2009-03-30 16:35:44.000000000 +0200
+--- sle11-2009-10-16.orig/drivers/xen/netfront/netfront.c 2009-03-30 16:34:59.000000000 +0200
++++ sle11-2009-10-16/drivers/xen/netfront/netfront.c 2009-03-30 16:35:44.000000000 +0200
@@ -1892,20 +1892,19 @@ static struct ethtool_ops network_ethtoo
};
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(netfront_remove),
---- sle11-2009-05-14.orig/drivers/xen/pciback/xenbus.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/pciback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/pciback/xenbus.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/pciback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -682,7 +682,6 @@ static const struct xenbus_device_id xen
static struct xenbus_driver xenbus_pciback_driver = {
.ids = xenpci_ids,
.probe = pciback_xenbus_probe,
.remove = pciback_xenbus_remove,
---- sle11-2009-05-14.orig/drivers/xen/pcifront/xenbus.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/pcifront/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/pcifront/xenbus.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/pcifront/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -436,7 +436,6 @@ MODULE_ALIAS("xen:pci");
static struct xenbus_driver xenbus_pcifront_driver = {
.ids = xenpci_ids,
.probe = pcifront_xenbus_probe,
.remove = pcifront_xenbus_remove,
---- sle11-2009-05-14.orig/drivers/xen/scsiback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/scsiback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/scsiback/xenbus.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/scsiback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -350,7 +350,6 @@ static struct xenbus_device_id scsiback_
static struct xenbus_driver scsiback = {
.ids = scsiback_ids,
.probe = scsiback_probe,
.remove = scsiback_remove,
---- sle11-2009-05-14.orig/drivers/xen/scsifront/xenbus.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/scsifront/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/scsifront/xenbus.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/scsifront/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -401,7 +401,6 @@ static struct xenbus_device_id scsifront
static struct xenbus_driver scsifront_driver = {
.ids = scsifront_ids,
.probe = scsifront_probe,
.remove = scsifront_remove,
---- sle11-2009-05-14.orig/drivers/xen/tpmback/common.h 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/tpmback/common.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/tpmback/common.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/tpmback/common.h 2009-03-04 11:25:55.000000000 +0100
@@ -54,11 +54,11 @@ typedef struct tpmif_st {
void tpmif_disconnect_complete(tpmif_t * tpmif);
void tpmif_xenbus_exit(void);
int tpmif_map(tpmif_t *tpmif, unsigned long shared_page, unsigned int evtchn);
irqreturn_t tpmif_be_int(int irq, void *dev_id);
---- sle11-2009-05-14.orig/drivers/xen/tpmback/interface.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/tpmback/interface.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/tpmback/interface.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/tpmback/interface.c 2009-03-04 11:25:55.000000000 +0100
@@ -156,13 +156,14 @@ void tpmif_disconnect_complete(tpmif_t *
free_tpmif(tpmif);
}
{
kmem_cache_destroy(tpmif_cachep);
}
---- sle11-2009-05-14.orig/drivers/xen/tpmback/tpmback.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/tpmback/tpmback.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/tpmback/tpmback.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/tpmback/tpmback.c 2009-03-04 11:25:55.000000000 +0100
@@ -923,22 +923,30 @@ static int __init tpmback_init(void)
spin_lock_init(&tpm_schedule_list_lock);
INIT_LIST_HEAD(&tpm_schedule_list);
+module_exit(tpmback_exit)
MODULE_LICENSE("Dual BSD/GPL");
---- sle11-2009-05-14.orig/drivers/xen/tpmback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/tpmback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/tpmback/xenbus.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/tpmback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -270,7 +270,6 @@ static const struct xenbus_device_id tpm
static struct xenbus_driver tpmback = {
}
void tpmif_xenbus_exit(void)
---- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/xenbus/xenbus_probe.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/xenbus/xenbus_probe.c 2009-03-04 11:25:55.000000000 +0100
@@ -365,7 +365,9 @@ static void xenbus_dev_shutdown(struct d
}
void xenbus_unregister_driver(struct xenbus_driver *drv)
{
---- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.h 2008-11-25 12:35:56.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/xenbus/xenbus_probe.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/xenbus/xenbus_probe.h 2009-03-04 11:25:55.000000000 +0100
@@ -63,7 +63,9 @@ extern int xenbus_match(struct device *_
extern int xenbus_dev_probe(struct device *_dev);
extern int xenbus_dev_remove(struct device *_dev);
extern int xenbus_probe_node(struct xen_bus_type *bus,
const char *type,
const char *nodename);
---- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe_backend.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/xenbus/xenbus_probe_backend.c 2009-03-04 11:25:55.000000000 +0100
@@ -172,13 +172,15 @@ static int xenbus_uevent_backend(struct
return 0;
}
/* backend/<typename>/<frontend-uuid>/<name> */
static int xenbus_probe_backend_unit(const char *dir,
---- sle11-2009-05-14.orig/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:25:55.000000000 +0100
@@ -235,7 +235,7 @@ static int bind_virq(void)
result = bind_virq_to_irqhandler(VIRQ_XENOPROF,
i,
"xenoprof",
NULL);
---- sle11-2009-05-14.orig/include/asm-x86/i8253.h 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/include/asm-x86/i8253.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/i8253.h 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/i8253.h 2009-03-04 11:25:55.000000000 +0100
@@ -8,10 +8,14 @@
extern spinlock_t i8253_lock;
#define inb_pit inb_p
#define outb_pit outb_p
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/desc_32.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/desc_32.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/desc_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/desc_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -21,7 +21,7 @@ struct Xgt_desc_struct {
extern struct Xgt_desc_struct idt_descr;
static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
{
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-04 11:28:11.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-04 11:28:11.000000000 +0100
@@ -158,6 +158,19 @@ static inline void arch_leave_lazy_mmu_m
#define arch_use_lazy_mmu_mode() unlikely(__get_cpu_var(xen_lazy_mmu))
#endif
HYPERVISOR_shutdown(
unsigned int reason)
{
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/mmu_context_32.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/mmu_context_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -27,13 +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)
{
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgalloc_32.h 2009-05-14 10:56:29.000000000 +0200
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgalloc_32.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/pgalloc_32.h 2009-10-28 14:55:09.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgalloc_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -6,12 +6,23 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
#ifdef CONFIG_X86_PAE
/*
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -275,6 +275,7 @@ static inline pte_t pte_mkhuge(pte_t pte
*/
#define pte_update(mm, addr, ptep) do { } while (0)
#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)
#else
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_32.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/processor_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -431,7 +431,7 @@ struct thread_struct {
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
set_fs(USER_DS); \
regs->xds = __USER_DS; \
regs->xes = __USER_DS; \
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/segment_32.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/segment_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -83,14 +83,8 @@
* The GDT has 32 entries
*/
+#define SEGMENT_IS_PNP_CODE(x) (((x) & ~0x0b) == GDT_ENTRY_PNPBIOS_BASE * 8)
+
#endif
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_32.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/smp_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -52,6 +52,11 @@ extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
#endif
/*
* This function is needed by all SMP systems. It must _always_ be valid
* from the initial startup. We map APIC_BASE very early in page_setup(),
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2009-03-04 11:25:55.000000000 +0100
@@ -9,7 +9,6 @@
#include <asm/scatterlist.h>
extern void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t gfp);
extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-03-04 11:25:55.000000000 +0100
@@ -416,15 +416,6 @@ static inline int pmd_large(pmd_t pte) {
#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
#define mk_pte_huge(entry) (__pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE)
/* Change flags of a PTE */
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_64.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/smp_64.h 2009-03-04 11:25:55.000000000 +0100
@@ -7,6 +7,7 @@
#include <linux/threads.h>
#include <linux/cpumask.h>
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- sle11-2009-05-14.orig/include/xen/xenbus.h 2008-11-25 12:35:56.000000000 +0100
-+++ sle11-2009-05-14/include/xen/xenbus.h 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/include/xen/xenbus.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-10-16/include/xen/xenbus.h 2009-03-04 11:25:55.000000000 +0100
@@ -93,8 +93,7 @@ struct xenbus_device_id
/* A xenbus driver. */
void xenbus_unregister_driver(struct xenbus_driver *drv);
struct xenbus_transaction
---- sle11-2009-05-14.orig/lib/swiotlb-xen.c 2009-03-20 10:00:58.000000000 +0100
-+++ sle11-2009-05-14/lib/swiotlb-xen.c 2009-03-04 11:25:55.000000000 +0100
+--- sle11-2009-10-16.orig/lib/swiotlb-xen.c 2009-03-20 10:00:58.000000000 +0100
++++ sle11-2009-10-16/lib/swiotlb-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -135,8 +135,8 @@ __setup("swiotlb=", setup_io_tlb_npages)
* Statically reserve bounce buffer space and initialize bounce buffer data
* structures for the software IO TLB used to implement the PCI DMA API.