Acked-by: jbeulich@novell.com
---- sle11-2009-06-29.orig/arch/x86/Kconfig 2009-02-05 10:22:38.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/Kconfig 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/Kconfig 2009-02-05 10:22:38.000000000 +0100
++++ sle11-2009-10-16/arch/x86/Kconfig 2009-02-16 16:18:36.000000000 +0100
@@ -50,15 +50,16 @@ config GENERIC_CMOS_UPDATE
config CLOCKSOURCE_WATCHDOG
help
DMA remapping (DMAR) devices support enables independent address
translations for Direct Memory Access (DMA) from devices.
---- sle11-2009-06-29.orig/arch/x86/Makefile 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/Makefile 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/Makefile 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/Makefile 2009-02-16 16:18:36.000000000 +0100
@@ -191,8 +191,8 @@ PHONY += zImage bzImage vmlinuz compress
zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
else
# Default kernel to build
all: bzImage
---- sle11-2009-06-29.orig/arch/x86/ia32/ia32entry-xen.S 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/ia32/ia32entry-xen.S 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/ia32/ia32entry-xen.S 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/ia32/ia32entry-xen.S 2009-02-16 16:18:36.000000000 +0100
@@ -125,20 +125,16 @@ sysenter_do_call:
jmp int_ret_from_sys_call
jmp cstar_do_call
END(ia32_cstar_target)
---- sle11-2009-06-29.orig/arch/x86/kernel/Makefile 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/Makefile 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/Makefile 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/Makefile 2009-02-16 16:18:36.000000000 +0100
@@ -127,4 +127,4 @@ endif
disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8253.o i8259_$(BITS).o reboot.o \
smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_64.o %/head_64.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
+%/head_64.o %/head_64.s: asflags-$(CONFIG_XEN) :=
---- sle11-2009-06-29.orig/arch/x86/kernel/acpi/sleep_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/acpi/sleep_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/acpi/sleep_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/acpi/sleep_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -90,7 +90,7 @@ __setup("acpi_sleep=", acpi_sleep_setup)
/* Ouch, we want to delete this. We already have better version in userspace, in
{
acpi_realmode_flags |= 2;
return 0;
---- sle11-2009-06-29.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/acpi/sleep_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/acpi/sleep_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -123,6 +123,3 @@ static int __init acpi_sleep_setup(char
__setup("acpi_sleep=", acpi_sleep_setup);
#endif /* CONFIG_ACPI_PV_SLEEP */
-void acpi_pci_link_exit(void)
-{
-}
---- sle11-2009-06-29.orig/arch/x86/kernel/apic_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/apic_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/apic_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/apic_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -63,22 +63,38 @@ int setup_profiling_timer(unsigned int m
void smp_local_timer_interrupt(void)
irq_exit();
}
---- sle11-2009-06-29.orig/arch/x86/kernel/cpu/common-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/cpu/common-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/cpu/common-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/cpu/common-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -214,7 +214,7 @@ static void __cpuinit get_cpu_vendor(str
static int __init x86_fxsr_setup(char * s)
disable_x86_fxsr = 1;
/*
---- sle11-2009-06-29.orig/arch/x86/kernel/e820_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/e820_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/e820_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/e820_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -52,6 +52,13 @@ struct resource code_resource = {
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
};
* memory space.
*/
last = 0x100000000ull;
---- sle11-2009-06-29.orig/arch/x86/kernel/e820_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/e820_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/e820_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/e820_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/page.h>
#include <asm/e820.h>
+ max_pfn << PAGE_SHIFT) - *addr;
+ return i + 1;
+}
---- sle11-2009-06-29.orig/arch/x86/kernel/early_printk-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/early_printk-xen.c 2009-02-16 16:18:36.000000000 +0100
-@@ -6,14 +6,9 @@
+--- sle11-2009-10-16.orig/arch/x86/kernel/early_printk-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/early_printk-xen.c 2009-09-24 10:27:18.000000000 +0200
+@@ -6,15 +6,10 @@
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/fcntl.h>
-+#include <asm/setup.h>
-
- /* Simple VGA output */
+-
+-/* Simple VGA output */
-
-#ifdef __i386__
-#else
-#include <asm/bootsetup.h>
-#endif
++
+ #ifndef CONFIG_XEN
++/* Simple VGA output */
#define VGABASE (__ISA_IO_base + 0xb8000)
- #ifndef CONFIG_XEN
+ static int max_ypos = 25, max_xpos = 80;
@@ -264,10 +259,10 @@ static int __init setup_early_printk(cha
early_console = &early_serial_console;
} else if (!strncmp(buf, "vga", 3)) {
#endif
early_console = &early_vga_console;
} else if (!strncmp(buf, "simnow", 6)) {
---- sle11-2009-06-29.orig/arch/x86/kernel/entry_32-xen.S 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:18:18.000000000 +0200
+--- sle11-2009-10-16.orig/arch/x86/kernel/entry_32-xen.S 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:18:18.000000000 +0200
@@ -254,6 +254,7 @@ check_userspace:
jb resume_kernel # not returning to v8086 or userspace
+#include "syscall_table_32.S"
syscall_table_size=(.-sys_call_table)
---- sle11-2009-06-29.orig/arch/x86/kernel/entry_64-xen.S 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/entry_64-xen.S 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/entry_64-xen.S 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/entry_64-xen.S 2009-02-16 16:18:36.000000000 +0100
@@ -57,7 +57,7 @@
#include <xen/interface/arch-x86_64.h>
#include <xen/interface/features.h>
call do_exit
CFI_ENDPROC
ENDPROC(child_rip)
---- sle11-2009-06-29.orig/arch/x86/kernel/genapic_64-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/genapic_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/genapic_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/genapic_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -24,12 +24,21 @@
#include <acpi/acpi_bus.h>
#endif
#ifndef CONFIG_XEN
struct genapic __read_mostly *genapic = &apic_flat;
---- sle11-2009-06-29.orig/arch/x86/kernel/head64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/head64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/head64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/head64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/arch/x86_64/kernel/head64.c -- prepare to run common code
#endif
early_printk("Kernel alive\n");
---- sle11-2009-06-29.orig/arch/x86/kernel/init_task-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/init_task-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/init_task-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/init_task-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -14,11 +14,11 @@ static struct fs_struct init_fs = INIT_F
static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
#endif
---- sle11-2009-06-29.orig/arch/x86/kernel/io_apic_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/io_apic_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/io_apic_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/io_apic_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -427,7 +427,7 @@ static struct irq_cpu_info {
#define IRQ_ALLOWED(cpu, allowed_mask) cpu_isset(cpu, allowed_mask)
#endif /* CONFIG_ACPI */
static int __init parse_disable_timer_pin_1(char *arg)
---- sle11-2009-06-29.orig/arch/x86/kernel/io_apic_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/io_apic_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/io_apic_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/io_apic_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -31,6 +31,7 @@
#include <linux/sysdev.h>
#include <linux/msi.h>
#endif
#endif /* !CONFIG_XEN */
+
---- sle11-2009-06-29.orig/arch/x86/kernel/ioport_32-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/ioport_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/ioport_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/ioport_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/ioport.c
* This contains the io-permission bitmap code - written by obz, with changes
* by Linus.
*/
---- sle11-2009-06-29.orig/arch/x86/kernel/ioport_64-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/ioport_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/ioport_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/ioport_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/ioport.c
* This contains the io-permission bitmap code - written by obz, with changes
* by Linus.
*/
---- sle11-2009-06-29.orig/arch/x86/kernel/irq_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/irq_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/irq_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/irq_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/irq.c
#endif
seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
#if defined(CONFIG_X86_IO_APIC)
---- sle11-2009-06-29.orig/arch/x86/kernel/irq_64-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/irq_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/irq_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/irq_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/irq.c
#ifndef CONFIG_X86_LOCAL_APIC
/*
---- sle11-2009-06-29.orig/arch/x86/kernel/ldt_32-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/ldt_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/ldt_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/ldt_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/ldt.c
out:
return error;
}
---- sle11-2009-06-29.orig/arch/x86/kernel/ldt_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/ldt_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/ldt_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/ldt_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/ldt.c
out:
return error;
}
---- sle11-2009-06-29.orig/arch/x86/kernel/mpparse_32-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/mpparse_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/mpparse_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/mpparse_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1023,7 +1023,7 @@ void __init mp_config_acpi_legacy_irqs (
/*
*/
for (i = 0; i < 16; i++) {
int idx;
---- sle11-2009-06-29.orig/arch/x86/kernel/mpparse_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/mpparse_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/mpparse_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/mpparse_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -57,6 +57,8 @@ unsigned long mp_lapic_addr = 0;
/* Processor that is doing the boot up */
{
num_processors++;
}
---- sle11-2009-06-29.orig/arch/x86/kernel/pci-dma-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/pci-dma-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/pci-dma-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/pci-dma-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -13,14 +13,13 @@
#include <linux/pci.h>
#include <linux/module.h>
if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
---- sle11-2009-06-29.orig/arch/x86/kernel/process_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/process_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/process_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/process_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/process.c
show_trace(NULL, regs, ®s->esp);
}
---- sle11-2009-06-29.orig/arch/x86/kernel/process_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/process_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/process_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/process_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86-64/kernel/process.c
__switch_to(struct task_struct *prev_p, struct task_struct *next_p)
{
struct thread_struct *prev = &prev_p->thread,
---- sle11-2009-06-29.orig/arch/x86/kernel/quirks-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/quirks-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/quirks-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/quirks-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -41,7 +41,353 @@ static void __devinit quirk_intel_irqbal
if (!(config & 0x2))
pci_write_config_byte(dev, 0xf4, config);
+}
+
#endif
---- sle11-2009-06-29.orig/arch/x86/kernel/setup64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/setup64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/setup64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/setup64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -15,7 +15,6 @@
#include <linux/bootmem.h>
#include <linux/bitops.h>
/*
* cpu_init() initializes state that is per-CPU. Some data is already
* initialized (naturally) in the bootstrap process, such as the GDT
---- sle11-2009-06-29.orig/arch/x86/kernel/setup_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/setup_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/setup_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/setup_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/setup.c
#endif
#ifdef CONFIG_ACPI
---- sle11-2009-06-29.orig/arch/x86/kernel/setup_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/setup_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/setup_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/setup_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,10 +1,5 @@
/*
- * linux/arch/x86-64/kernel/setup.c
return c_start(m, pos);
}
---- sle11-2009-06-29.orig/arch/x86/kernel/smp_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/smp_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/smp_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/smp_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -72,7 +72,7 @@
*
* B stepping CPUs may hang. There are hardware work arounds
irq_exit();
if (wait) {
---- sle11-2009-06-29.orig/arch/x86/kernel/smp_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/smp_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/smp_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/smp_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -167,6 +167,7 @@ asmlinkage void smp_invalidate_interrupt
out:
ack_APIC_irq();
irq_exit();
if (wait) {
mb();
---- sle11-2009-06-29.orig/arch/x86/kernel/time_32-xen.c 2009-03-24 10:12:09.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/time_32-xen.c 2009-03-24 10:12:35.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/time_32-xen.c 2009-10-28 14:57:53.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/time_32-xen.c 2009-10-28 14:57:59.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/time.c
/*
* Here we are in the timer irq handler. We just have irqs locally
* disabled but we don't know if the timer_bh is running on the other
-@@ -994,7 +1000,7 @@ static int time_cpufreq_notifier(struct
+@@ -995,7 +1001,7 @@ static int time_cpufreq_notifier(struct
struct cpufreq_freqs *freq = data;
struct xen_platform_op op;
return 0;
if (val == CPUFREQ_PRECHANGE)
-@@ -1032,30 +1038,33 @@ core_initcall(cpufreq_time_setup);
+@@ -1033,30 +1039,33 @@ core_initcall(cpufreq_time_setup);
*/
static ctl_table xen_subtable[] = {
{
};
static int __init xen_sysctl_init(void)
{
---- sle11-2009-06-29.orig/arch/x86/kernel/traps_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/traps_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/traps_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/traps_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/traps.c
/*
* NB. All these are "trap gates" (i.e. events_mask isn't set) except
---- sle11-2009-06-29.orig/arch/x86/kernel/traps_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/traps_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/traps_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/traps_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86-64/traps.c
get_debugreg(condition, 6);
if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
---- sle11-2009-06-29.orig/arch/x86/kernel/vsyscall_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/kernel/vsyscall_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/vsyscall_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/kernel/vsyscall_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/vsyscall.c
write_rdtscp_aux((node << 12) | cpu);
/* Store cpu number in limit so that it can be loaded quickly
---- sle11-2009-06-29.orig/arch/x86/mm/fault_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/fault_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/fault_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/fault_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
goto no_context;
do_sigbus:
---- sle11-2009-06-29.orig/arch/x86/mm/fault_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/fault_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/fault_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/fault_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
- return 1;
-}
-__setup("pagefaulttrace", enable_pagefaulttrace);
---- sle11-2009-06-29.orig/arch/x86/mm/hypervisor.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/hypervisor.c 2009-05-06 10:23:43.000000000 +0200
+--- sle11-2009-10-16.orig/arch/x86/mm/hypervisor.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/hypervisor.c 2009-05-06 10:23:43.000000000 +0200
@@ -496,6 +496,9 @@ int xen_create_contiguous_region(
unsigned long frame, flags;
unsigned int i;
cr_mcl[i - 1].args[MULTI_UVMFLAGS_INDEX] = order
? UVMF_TLB_FLUSH|UVMF_ALL
: UVMF_INVLPG|UVMF_ALL;
---- sle11-2009-06-29.orig/arch/x86/mm/init_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/init_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/init_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/init_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -94,7 +94,14 @@ static pte_t * __init one_page_table_ini
#else
if (!(__pmd_val(*pmd) & _PAGE_PRESENT)) {
}
/*
---- sle11-2009-06-29.orig/arch/x86/mm/init_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/init_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/init_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/init_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -767,7 +767,7 @@ static void xen_finish_init_mapping(void
/* Setup the direct mapping of the physical memory at PAGE_OFFSET.
This runs before bootmem is initialized and gets pages directly from the
+ return 0;
+}
+#endif
---- sle11-2009-06-29.orig/arch/x86/mm/pageattr_64-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/pageattr_64-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/pageattr_64-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/pageattr_64-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -17,9 +17,6 @@
#include <asm/pgalloc.h>
#include <asm/mmu_context.h>
flush_map(&l);
---- sle11-2009-06-29.orig/arch/x86/mm/pgtable_32-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/pgtable_32-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/mm/pgtable_32-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/mm/pgtable_32-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -6,6 +6,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
{
memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
}
---- sle11-2009-06-29.orig/arch/x86/pci/irq-xen.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/pci/irq-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/pci/irq-xen.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/arch/x86/pci/irq-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -173,7 +173,7 @@ void eisa_set_level_irq(unsigned int irq
}
{
if (!acer_tm360_irqrouting) {
acer_tm360_irqrouting = 1;
---- sle11-2009-06-29.orig/drivers/acpi/processor_idle.c 2009-06-29 15:17:44.000000000 +0200
-+++ sle11-2009-06-29/drivers/acpi/processor_idle.c 2009-06-29 15:29:06.000000000 +0200
+--- sle11-2009-10-16.orig/drivers/acpi/processor_idle.c 2009-08-26 11:52:33.000000000 +0200
++++ sle11-2009-10-16/drivers/acpi/processor_idle.c 2009-06-29 15:29:06.000000000 +0200
@@ -1749,6 +1749,13 @@ int acpi_processor_cst_has_changed(struc
if (!pr->flags.power_setup_done)
return -ENODEV;
cpuidle_pause_and_lock();
cpuidle_disable_device(&pr->power.dev);
acpi_processor_get_power_info(pr);
---- sle11-2009-06-29.orig/drivers/cpuidle/Kconfig 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/cpuidle/Kconfig 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/cpuidle/Kconfig 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/cpuidle/Kconfig 2009-02-16 16:18:36.000000000 +0100
@@ -1,6 +1,7 @@
config CPU_IDLE
default ACPI
help
CPU idle is a generic framework for supporting software-controlled
---- sle11-2009-06-29.orig/drivers/oprofile/cpu_buffer.c 2009-02-16 16:01:39.000000000 +0100
-+++ sle11-2009-06-29/drivers/oprofile/cpu_buffer.c 2009-03-12 16:15:32.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/oprofile/cpu_buffer.c 2009-02-16 16:01:39.000000000 +0100
++++ sle11-2009-10-16/drivers/oprofile/cpu_buffer.c 2009-03-12 16:15:32.000000000 +0100
@@ -308,6 +308,37 @@ void oprofile_add_trace(unsigned long pc
}
int oprofile_add_domain_switch(int32_t domain_id)
{
struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()];
---- sle11-2009-06-29.orig/drivers/pci/msi-xen.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/drivers/pci/msi-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/pci/msi-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/drivers/pci/msi-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -264,6 +264,12 @@ static int msi_map_vector(struct pci_dev
return msi_map_pirq_to_vector(dev, -1, entry_nr, table_base);
}
dev->msix_enabled = 0;
}
EXPORT_SYMBOL(pci_disable_msix);
---- sle11-2009-06-29.orig/drivers/xen/blkback/blkback.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/blkback/blkback.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/blkback/blkback.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/blkback/blkback.c 2009-02-16 16:18:36.000000000 +0100
@@ -269,13 +269,10 @@ static void __end_block_io_op(pending_re
}
}
}
---- sle11-2009-06-29.orig/drivers/xen/blkfront/blkfront.c 2009-03-24 10:12:03.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/blkfront/blkfront.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/blkfront/blkfront.c 2009-03-24 10:12:03.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/blkfront/blkfront.c 2009-02-16 16:18:36.000000000 +0100
@@ -233,7 +233,7 @@ static int setup_blkring(struct xenbus_d
SHARED_RING_INIT(sring);
FRONT_RING_INIT(&info->ring, sring, PAGE_SIZE);
fsect = sg->offset >> 9;
lsect = fsect + (sg->length >> 9) - 1;
/* install a grant reference. */
---- sle11-2009-06-29.orig/drivers/xen/core/firmware.c 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/core/firmware.c 2009-03-25 18:10:23.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/core/firmware.c 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/core/firmware.c 2009-03-25 18:10:23.000000000 +0100
@@ -1,4 +1,5 @@
#include <linux/kernel.h>
+#include <linux/string.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/edd.h>
---- sle11-2009-06-29.orig/drivers/xen/core/machine_kexec.c 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/core/machine_kexec.c 2009-02-17 11:46:41.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/core/machine_kexec.c 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/core/machine_kexec.c 2009-02-17 11:46:41.000000000 +0100
@@ -29,6 +29,10 @@ void __init xen_machine_kexec_setup_reso
int k = 0;
int rc;
void machine_shutdown(void)
{
/* do nothing */
---- sle11-2009-06-29.orig/drivers/xen/core/smpboot.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/core/smpboot.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/core/smpboot.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/core/smpboot.c 2009-02-16 16:18:36.000000000 +0100
@@ -45,8 +45,8 @@ cpumask_t cpu_possible_map;
EXPORT_SYMBOL(cpu_possible_map);
cpumask_t cpu_initialized_map;
#ifdef __x86_64__
cpu_pda(cpu)->pcurrent = idle;
---- sle11-2009-06-29.orig/drivers/xen/netback/loopback.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/netback/loopback.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/netback/loopback.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/netback/loopback.c 2009-02-16 16:18:36.000000000 +0100
@@ -285,9 +285,9 @@ static void __exit clean_loopback(int i)
char dev_name[IFNAMSIZ];
if (dev1 && dev2) {
unregister_netdev(dev2);
unregister_netdev(dev1);
---- sle11-2009-06-29.orig/drivers/xen/netback/netback.c 2008-12-23 09:33:22.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/netback/netback.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/netback/netback.c 2008-12-23 09:33:22.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/netback/netback.c 2009-02-16 16:18:36.000000000 +0100
@@ -350,8 +350,8 @@ static void xen_network_done_notify(void
{
static struct net_device *eth0_dev = NULL;
}
/*
* Add following to poll() function in NAPI driver (Tigon3 is example):
---- sle11-2009-06-29.orig/drivers/xen/netback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/netback/xenbus.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/netback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/netback/xenbus.c 2009-02-16 16:18:36.000000000 +0100
@@ -149,12 +149,10 @@ fail:
* and vif variables to the environment, for the benefit of the vif-* hotplug
* scripts.
return 0;
}
---- sle11-2009-06-29.orig/drivers/xen/netfront/accel.c 2009-04-09 14:43:45.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/netfront/accel.c 2009-03-30 16:39:19.000000000 +0200
+--- sle11-2009-10-16.orig/drivers/xen/netfront/accel.c 2009-04-09 14:43:45.000000000 +0200
++++ sle11-2009-10-16/drivers/xen/netfront/accel.c 2009-03-30 16:39:19.000000000 +0200
@@ -313,7 +313,7 @@ accelerator_set_vif_state_hooks(struct n
DPRINTK("%p\n",vif_state);
}
---- sle11-2009-06-29.orig/drivers/xen/netfront/netfront.c 2009-03-30 16:36:30.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/netfront/netfront.c 2009-03-30 16:39:44.000000000 +0200
+--- sle11-2009-10-16.orig/drivers/xen/netfront/netfront.c 2009-03-30 16:36:30.000000000 +0200
++++ sle11-2009-10-16/drivers/xen/netfront/netfront.c 2009-03-30 16:39:44.000000000 +0200
@@ -626,6 +626,7 @@ static int network_open(struct net_devic
struct netfront_info *np = netdev_priv(dev);
SET_NETDEV_DEV(netdev, &dev->dev);
np->netdev = netdev;
---- sle11-2009-06-29.orig/drivers/xen/netfront/netfront.h 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/netfront/netfront.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/netfront/netfront.h 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/netfront/netfront.h 2009-02-16 16:18:36.000000000 +0100
@@ -157,6 +157,8 @@ struct netfront_info {
spinlock_t tx_lock;
spinlock_t rx_lock;
unsigned int irq;
unsigned int copying_receiver;
unsigned int carrier;
---- sle11-2009-06-29.orig/drivers/xen/pciback/Makefile 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/pciback/Makefile 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/pciback/Makefile 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/pciback/Makefile 2009-02-16 16:18:36.000000000 +0100
@@ -12,6 +12,4 @@ pciback-$(CONFIG_XEN_PCIDEV_BACKEND_SLOT
pciback-$(CONFIG_XEN_PCIDEV_BACKEND_PASS) += passthrough.o
pciback-$(CONFIG_XEN_PCIDEV_BACKEND_CONTROLLER) += controller.o
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_XEN_PCIDEV_BE_DEBUG) += -DDEBUG
---- sle11-2009-06-29.orig/drivers/xen/pcifront/Makefile 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/pcifront/Makefile 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/pcifront/Makefile 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/pcifront/Makefile 2009-02-16 16:18:36.000000000 +0100
@@ -2,6 +2,4 @@ obj-y += pcifront.o
pcifront-y := pci_op.o xenbus.o pci.o
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_XEN_PCIDEV_FE_DEBUG) += -DDEBUG
---- sle11-2009-06-29.orig/drivers/xen/scsiback/emulate.c 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/scsiback/emulate.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/scsiback/emulate.c 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/scsiback/emulate.c 2009-02-16 16:18:36.000000000 +0100
@@ -104,9 +104,10 @@ static void resp_not_supported_cmd(pendi
}
to += copy_size;
}
---- sle11-2009-06-29.orig/drivers/xen/scsiback/scsiback.c 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/scsiback/scsiback.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/scsiback/scsiback.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/scsiback/scsiback.c 2009-02-16 16:18:36.000000000 +0100
@@ -247,6 +247,8 @@ static int scsiback_gnttab_data_map(vscs
write = (data_dir == DMA_TO_DEVICE);
}
return err;
---- sle11-2009-06-29.orig/drivers/xen/scsifront/scsifront.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/scsifront/scsifront.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/scsifront/scsifront.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/scsifront/scsifront.c 2009-02-16 16:18:36.000000000 +0100
@@ -246,11 +246,10 @@ static int map_data_for_request(struct v
{
grant_ref_t gref_head;
off = 0;
ref_cnt++;
}
---- sle11-2009-06-29.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/sfc_netback/accel_fwd.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/sfc_netback/accel_fwd.c 2009-02-16 16:18:36.000000000 +0100
@@ -181,10 +181,11 @@ int netback_accel_fwd_add(const __u8 *ma
unsigned long flags;
cuckoo_hash_mac_key key = cuckoo_mac_to_key(mac);
spin_lock_irqsave(&fwd_set->fwd_lock, flags);
/*
---- sle11-2009-06-29.orig/drivers/xen/sfc_netback/accel_msg.c 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/sfc_netback/accel_msg.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/sfc_netback/accel_msg.c 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/sfc_netback/accel_msg.c 2009-02-16 16:18:36.000000000 +0100
@@ -57,11 +57,11 @@ static void netback_accel_msg_tx_localma
{
unsigned long lock_state;
msg = net_accel_msg_start_send(bend->shared_page, &bend->to_domU,
&lock_state);
---- sle11-2009-06-29.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/sfc_netfront/accel_msg.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/sfc_netfront/accel_msg.c 2009-02-16 16:18:36.000000000 +0100
@@ -41,11 +41,13 @@ static void vnic_start_interrupts(netfro
/* Prime our interrupt */
spin_lock_irqsave(&vnic->irq_enabled_lock, flags);
}
else {
spin_unlock_irqrestore(&vnic->irq_enabled_lock, flags);
---- sle11-2009-06-29.orig/drivers/xen/sfc_netfront/accel_vi.c 2009-03-30 16:36:26.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/sfc_netfront/accel_vi.c 2009-03-30 16:39:38.000000000 +0200
+--- sle11-2009-10-16.orig/drivers/xen/sfc_netfront/accel_vi.c 2009-03-30 16:36:26.000000000 +0200
++++ sle11-2009-10-16/drivers/xen/sfc_netfront/accel_vi.c 2009-03-30 16:39:38.000000000 +0200
@@ -641,8 +641,10 @@ netfront_accel_vi_tx_post(netfront_accel
(cuckoo_hash_key *)(&key), &value);
if (ip->protocol == IPPROTO_TCP) {
struct tcphdr *tcp = (struct tcphdr *)
---- sle11-2009-06-29.orig/drivers/xen/sfc_netutil/accel_util.h 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/sfc_netutil/accel_util.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/sfc_netutil/accel_util.h 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/sfc_netutil/accel_util.h 2009-02-16 16:18:36.000000000 +0100
@@ -63,9 +63,6 @@
DPRINTK("%s at %s:%d\n", #exp, __FILE__, __LINE__); \
} while(0)
#include <xen/xenbus.h>
/*! Map a set of pages from another domain
---- sle11-2009-06-29.orig/drivers/xen/xenbus/xenbus_probe.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/xenbus/xenbus_probe.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/xenbus/xenbus_probe.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/xenbus/xenbus_probe.c 2009-02-16 16:18:36.000000000 +0100
@@ -174,11 +174,9 @@ static int read_backend_details(struct x
}
return 0;
}
---- sle11-2009-06-29.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/xenbus/xenbus_probe_backend.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/xenbus/xenbus_probe_backend.c 2009-02-16 16:18:36.000000000 +0100
@@ -60,8 +60,7 @@
#include <xen/platform-compat.h>
#endif
}
return 0;
---- sle11-2009-06-29.orig/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:25:55.000000000 +0100
-+++ sle11-2009-06-29/drivers/xen/xenoprof/xenoprofile.c 2009-03-11 15:39:38.000000000 +0100
+--- sle11-2009-10-16.orig/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-10-16/drivers/xen/xenoprof/xenoprofile.c 2009-03-11 15:39:38.000000000 +0100
@@ -29,7 +29,6 @@
#include <xen/driver_util.h>
#include <xen/interface/xen.h>
if (!is_passive)
oprofile_samples++;
else
---- sle11-2009-06-29.orig/fs/xfs/linux-2.6/xfs_buf.c 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/fs/xfs/linux-2.6/xfs_buf.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/fs/xfs/linux-2.6/xfs_buf.c 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/fs/xfs/linux-2.6/xfs_buf.c 2009-02-16 16:18:36.000000000 +0100
@@ -187,7 +187,7 @@ free_address(
{
a_list_t *aentry;
/*
* Xen needs to be able to make sure it can get an exclusive
* RO mapping of pages it wants to turn into a pagetable. If
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/agp.h 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/agp.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/agp.h 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/agp.h 2009-02-16 16:18:36.000000000 +0100
@@ -1,20 +1,22 @@
-#ifndef AGP_H
-#define AGP_H 1
/* Convert a physical address to an address suitable for the GART. */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/desc.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/desc.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "desc_32.h"
+#else
+# include "desc_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/desc_64.h 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/desc_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/desc_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/desc_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -34,6 +34,18 @@ static inline void clear_LDT(void)
put_cpu();
}
static inline void set_tssldt_descriptor(void *ptr, unsigned long tss, unsigned type,
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/dma-mapping.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/dma-mapping.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dma-mapping_32.h"
+#else
+# include "dma-mapping_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2008-12-15 11:26:44.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/dma-mapping_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -7,9 +7,9 @@
*/
#include <asm/swiotlb.h>
static inline int
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -6,8 +6,7 @@
* documentation.
*/
-#include <asm-i386/mach-xen/asm/dma-mapping.h>
+#include "dma-mapping_32.h"
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/fixmap.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/fixmap.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "fixmap_32.h"
+# include "fixmap_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/hypercall.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/hypercall.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,404 @@
+/******************************************************************************
+ * hypercall.h
+}
+
+#endif /* __HYPERCALL_H__ */
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/hypercall_32.h 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/hypercall_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/hypercall_32.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/hypercall_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -1,191 +1,10 @@
-/******************************************************************************
- * hypercall.h
-
-
-#endif /* __HYPERCALL_H__ */
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/hypercall_64.h 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/hypercall_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/hypercall_64.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/hypercall_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -1,197 +1,10 @@
-/******************************************************************************
- * hypercall.h
-}
-
-#endif /* __HYPERCALL_H__ */
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-04 11:28:11.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/hypervisor.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-04 11:28:11.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/hypervisor.h 2009-02-16 16:18:36.000000000 +0100
@@ -194,7 +194,6 @@ static inline void xen_multicall_flush(b
extern char hypercall_page[PAGE_SIZE];
#else
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/io.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/io.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "io_32.h"
+# include "io_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/irqflags.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/irqflags.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irqflags_32.h"
+#else
+# include "irqflags_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/irqflags_32.h 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/irqflags_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/irqflags_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/irqflags_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -148,6 +148,23 @@ static inline int raw_irqs_disabled_flag
\
raw_irqs_disabled_flags(flags); \
+#endif
+
#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/irqflags_64.h 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/irqflags_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/irqflags_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/irqflags_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -116,6 +116,22 @@ static inline int raw_irqs_disabled_flag
})
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/maddr.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/maddr.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "maddr_32.h"
+# include "maddr_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/mmu_context.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/mmu_context.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmu_context_32.h"
+# include "mmu_context_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/page.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/page.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "page_64.h"
+# endif
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/page_64.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/page_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/page_64.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/page_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -207,6 +207,7 @@ static inline unsigned long __phys_addr(
VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pci.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pci.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,100 @@
+#ifndef __x86_PCI_H
+#define __x86_PCI_H
+
+
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/pci_32.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pci_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/pci_32.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pci_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -4,52 +4,10 @@
#ifdef __KERNEL__
#endif /* __i386_PCI_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgalloc.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgalloc.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgalloc_32.h"
+#else
+# include "pgalloc_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/pgalloc_64.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgalloc_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/pgalloc_64.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgalloc_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -112,6 +112,8 @@ static inline void pgd_list_del(pgd_t *p
spin_unlock(&pgd_lock);
}
free_pages((unsigned long)pgd, 1);
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgtable.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgtable.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgtable_32.h"
+#else
+# include "pgtable_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -17,10 +17,7 @@
#include <asm/fixmap.h>
#include <linux/threads.h>
void pgtable_cache_init(void);
void paging_init(void);
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -9,7 +9,7 @@
* the x86-64 page table tree.
*/
#define MODULES_END _AC(0xfffffffffff00000, UL)
#define MODULES_LEN (MODULES_END - MODULES_VADDR)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/processor.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/processor.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/processor_32.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/processor_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/processor_32.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/processor_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -80,6 +80,7 @@ struct cpuinfo_x86 {
unsigned char booted_cores; /* number of cores as seen by OS */
__u8 phys_proc_id; /* Physical processor id. */
#else
#define ASM_NOP1 GENERIC_NOP1
#define ASM_NOP2 GENERIC_NOP2
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/processor_64.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/processor_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/processor_64.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/processor_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -74,6 +74,7 @@ struct cpuinfo_x86 {
__u8 booted_cores; /* number of cores as seen by OS */
__u8 phys_proc_id; /* Physical Processor id. */
unsigned long edx)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/segment.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/segment.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "segment_32.h"
+# include "../../segment_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/smp.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/smp.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "smp_32.h"
+#else
+# include "smp_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/smp_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/smp_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -11,7 +11,7 @@
#endif
#ifdef CONFIG_HOTPLUG_CPU
extern void cpu_exit_clear(void);
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-15 11:27:22.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/smp_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/smp_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -40,10 +40,19 @@ extern void lock_ipi_call_lock(void);
extern void unlock_ipi_call_lock(void);
extern int smp_num_siblings;
#endif /* !CONFIG_SMP */
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/swiotlb.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/swiotlb.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "swiotlb_32.h"
+# include "../../swiotlb.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/system.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/system.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "system_32.h"
+#else
+# include "system_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/system_32.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/system_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/system_32.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/system_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -9,6 +9,7 @@
#include <asm/hypervisor.h>
+void __show_registers(struct pt_regs *, int all);
#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/system_64.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/system_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/system_64.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/system_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -11,8 +11,12 @@
#ifdef __KERNEL__
#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/tlbflush.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/tlbflush.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "tlbflush_32.h"
+#else
+# include "tlbflush_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/tlbflush_32.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/tlbflush_32.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/tlbflush_32.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/tlbflush_32.h 2009-02-16 16:18:36.000000000 +0100
@@ -23,7 +23,6 @@
* - flush_tlb_page(vma, vmaddr) flushes one page
* - flush_tlb_range(vma, start, end) flushes a range of pages
-}
-
#endif /* _I386_TLBFLUSH_H */
---- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/tlbflush_64.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/tlbflush_64.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/tlbflush_64.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/tlbflush_64.h 2009-02-16 16:18:36.000000000 +0100
@@ -28,7 +28,6 @@
* - flush_tlb_page(vma, vmaddr) flushes one page
* - flush_tlb_range(vma, start, end) flushes a range of pages
-
#endif /* _X8664_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/xor.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/xor.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "../../xor_32.h"
+#else
+# include "xor_64.h"
+#endif
---- sle11-2009-06-29.orig/include/asm-x86/mmu.h 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/include/asm-x86/mmu.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mmu.h 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mmu.h 2009-02-16 16:18:36.000000000 +0100
@@ -16,6 +16,9 @@ typedef struct {
rwlock_t ldtlock;
#endif
struct mutex lock;
void *vdso;
} mm_context_t;
---- sle11-2009-06-29.orig/include/linux/kexec.h 2009-02-16 15:58:14.000000000 +0100
-+++ sle11-2009-06-29/include/linux/kexec.h 2009-02-17 12:43:57.000000000 +0100
+--- sle11-2009-10-16.orig/include/linux/kexec.h 2009-08-26 11:52:33.000000000 +0200
++++ sle11-2009-10-16/include/linux/kexec.h 2009-02-17 12:43:57.000000000 +0100
@@ -202,8 +202,15 @@ extern int dump_after_notifier;
#define VMCOREINFO_BYTES (4096)
#define VMCOREINFO_NOTE_NAME "VMCOREINFO"
/* Location of a reserved region to hold the crash kernel.
*/
---- sle11-2009-06-29.orig/include/linux/oprofile.h 2009-06-29 15:28:01.000000000 +0200
-+++ sle11-2009-06-29/include/linux/oprofile.h 2009-06-29 15:28:57.000000000 +0200
+--- sle11-2009-10-16.orig/include/linux/oprofile.h 2009-06-29 15:28:01.000000000 +0200
++++ sle11-2009-10-16/include/linux/oprofile.h 2009-06-29 15:28:57.000000000 +0200
@@ -119,6 +119,8 @@ void oprofile_add_pc(unsigned long pc, i
/* add a backtrace entry, to be called from the ->backtrace callback */
void oprofile_add_trace(unsigned long eip);
/* add a domain switch entry */
int oprofile_add_domain_switch(int32_t domain_id);
---- sle11-2009-06-29.orig/include/linux/sysctl.h 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/include/linux/sysctl.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/linux/sysctl.h 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/include/linux/sysctl.h 2009-02-16 16:18:36.000000000 +0100
@@ -69,6 +69,7 @@ enum
CTL_BUS=8, /* Busses */
CTL_ABI=9, /* Binary emulation */
CTL_ARLAN=254, /* arlan wireless driver */
CTL_S390DBF=5677, /* s390 debug */
CTL_SUNRPC=7249, /* sunrpc debug */
---- sle11-2009-06-29.orig/include/xen/pcifront.h 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/include/xen/pcifront.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/xen/pcifront.h 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/include/xen/pcifront.h 2009-02-16 16:18:36.000000000 +0100
@@ -12,13 +12,11 @@
#ifndef __ia64__
struct pcifront_sd *sd)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-29/include/xen/sysctl.h 2009-02-16 16:18:36.000000000 +0100
++++ sle11-2009-10-16/include/xen/sysctl.h 2009-02-16 16:18:36.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef _XEN_SYSCTL_H
+#define _XEN_SYSCTL_H
+};
+
+#endif /* _XEN_SYSCTL_H */
---- sle11-2009-06-29.orig/include/xen/xenbus.h 2009-02-16 16:17:21.000000000 +0100
-+++ sle11-2009-06-29/include/xen/xenbus.h 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/include/xen/xenbus.h 2009-02-16 16:17:21.000000000 +0100
++++ sle11-2009-10-16/include/xen/xenbus.h 2009-02-16 16:18:36.000000000 +0100
@@ -107,7 +107,7 @@ struct xenbus_driver {
int (*suspend)(struct xenbus_device *dev);
int (*suspend_cancel)(struct xenbus_device *dev);
struct device_driver driver;
int (*read_otherend_details)(struct xenbus_device *dev);
int (*is_ready)(struct xenbus_device *dev);
---- sle11-2009-06-29.orig/kernel/kexec.c 2009-02-17 11:34:22.000000000 +0100
-+++ sle11-2009-06-29/kernel/kexec.c 2009-02-17 12:38:20.000000000 +0100
+--- sle11-2009-10-16.orig/kernel/kexec.c 2009-02-17 11:34:22.000000000 +0100
++++ sle11-2009-10-16/kernel/kexec.c 2009-02-17 12:38:20.000000000 +0100
@@ -52,7 +52,11 @@ int dump_after_notifier;
/* vmcoreinfo stuff */
VMCOREINFO_SYMBOL(_stext);
#ifndef CONFIG_NEED_MULTIPLE_NODES
---- sle11-2009-06-29.orig/kernel/sysctl_check.c 2009-06-29 15:14:52.000000000 +0200
-+++ sle11-2009-06-29/kernel/sysctl_check.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/kernel/sysctl_check.c 2009-10-28 14:55:06.000000000 +0100
++++ sle11-2009-10-16/kernel/sysctl_check.c 2009-02-16 16:18:36.000000000 +0100
@@ -4,6 +4,7 @@
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
{ CTL_ARLAN, "arlan", trans_arlan_table },
{ CTL_S390DBF, "s390dbf", trans_s390dbf_table },
{ CTL_SUNRPC, "sunrpc", trans_sunrpc_table },
---- sle11-2009-06-29.orig/lib/swiotlb-xen.c 2009-02-05 11:16:51.000000000 +0100
-+++ sle11-2009-06-29/lib/swiotlb-xen.c 2009-02-16 16:18:36.000000000 +0100
+--- sle11-2009-10-16.orig/lib/swiotlb-xen.c 2009-02-05 11:16:51.000000000 +0100
++++ sle11-2009-10-16/lib/swiotlb-xen.c 2009-02-16 16:18:36.000000000 +0100
@@ -27,7 +27,7 @@
#include <asm/uaccess.h>
#include <xen/gnttab.h>
projects / ipfire-2.x.git / blobdiff