Acked-by: jbeulich@novell.com
-Index: head-2008-12-01/arch/x86/Makefile
-===================================================================
---- head-2008-12-01.orig/arch/x86/Makefile 2008-12-01 11:11:08.000000000 +0100
-+++ head-2008-12-01/arch/x86/Makefile 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/Makefile 2008-12-01 11:11:08.000000000 +0100
++++ sle11-2009-05-14/arch/x86/Makefile 2009-02-16 16:17:21.000000000 +0100
@@ -148,7 +148,7 @@ libs-y += arch/x86/lib/
core-y += $(fcore-y)
# lguest paravirtualization support
core-$(CONFIG_LGUEST_GUEST) += arch/x86/lguest/
-Index: head-2008-12-01/arch/x86/kernel/acpi/sleep_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/acpi/sleep_32-xen.c 2008-04-15 09:29:41.000000000 +0200
-+++ head-2008-12-01/arch/x86/kernel/acpi/sleep_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/acpi/sleep_32-xen.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/acpi/sleep_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -15,7 +15,7 @@
#ifndef CONFIG_ACPI_PV_SLEEP
/* address in low memory of the wakeup routine. */
return 0;
}
-Index: head-2008-12-01/arch/x86/kernel/asm-offsets_32.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/asm-offsets_32.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/asm-offsets_32.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/asm-offsets_32.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/asm-offsets_32.c 2009-02-16 16:17:21.000000000 +0100
@@ -19,7 +19,9 @@
#include <asm/bootparam.h>
#include <asm/elf.h>
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
-Index: head-2008-12-01/arch/x86/kernel/cpu/common-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/cpu/common-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/cpu/common-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/cpu/common-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/cpu/common-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -360,6 +360,8 @@ static void __cpuinit generic_identify(s
if ( xlvl >= 0x80000004 )
get_model_name(c); /* Default name */
nexgen_init_cpu();
umc_init_cpu();
early_cpu_detect();
-Index: head-2008-12-01/arch/x86/kernel/cpu/mtrr/main-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/cpu/mtrr/main-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
{
}
-Index: head-2008-12-01/arch/x86/kernel/e820_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/e820_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/e820_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/e820_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/e820_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/efi.h>
#include <linux/pfn.h>
break;
}
}
-Index: head-2008-12-01/arch/x86/kernel/entry_32.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/entry_32.S 2008-12-01 11:21:02.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/entry_32.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/entry_32.S 2008-11-25 12:35:53.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/entry_32.S 2009-02-16 16:17:21.000000000 +0100
@@ -1112,7 +1112,7 @@ ENTRY(kernel_thread_helper)
CFI_ENDPROC
ENDPROC(kernel_thread_helper)
#ifdef CONFIG_FTRACE
#ifdef CONFIG_DYNAMIC_FTRACE
-Index: head-2008-12-01/arch/x86/kernel/entry_32-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/entry_32-xen.S 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/entry_32-xen.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/entry_32-xen.S 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/entry_32-xen.S 2009-02-16 16:17:21.000000000 +0100
@@ -452,9 +452,6 @@ restore_nocheck_notrace:
1: INTERRUPT_RETURN
.section .fixup,"ax"
pushl $0 # no error code
pushl $do_iret_error
jmp error_code
-Index: head-2008-12-01/arch/x86/kernel/head_32-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/head_32-xen.S 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/head_32-xen.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/head_32-xen.S 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/head_32-xen.S 2009-02-16 16:17:21.000000000 +0100
@@ -86,7 +86,10 @@ ENTRY(_stext)
/*
* BSS section
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
-Index: head-2008-12-01/arch/x86/kernel/init_task-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/init_task-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2008-12-01/arch/x86/kernel/init_task-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/init_task-xen.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/init_task-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -46,6 +46,6 @@ EXPORT_SYMBOL(init_task);
* per-CPU TSS segments. Threads are completely 'soft' on Linux,
* no more per-task TSS's.
+DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
#endif
-Index: head-2008-12-01/arch/x86/kernel/io_apic_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/io_apic_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/io_apic_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/io_apic_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -402,14 +402,6 @@ static void set_ioapic_affinity_irq(unsi
# include <linux/slab.h> /* kmalloc() */
# include <linux/timer.h> /* time_after() */
{
unsigned long t1 = jiffies;
-Index: head-2008-12-01/arch/x86/kernel/irq_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/irq_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/irq_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/irq_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/irq_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -21,7 +21,7 @@
#include <asm/apic.h>
#include <asm/uaccess.h>
/*
* allocate per-cpu stacks for hardirq and for softirq processing
-Index: head-2008-12-01/arch/x86/kernel/microcode-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/microcode-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/microcode-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/microcode-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/microcode-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/miscdevice.h>
#include <linux/spinlock.h>
#include <linux/mutex.h>
#include <linux/cpu.h>
#include <linux/firmware.h>
-Index: head-2008-12-01/arch/x86/kernel/pci-dma-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/pci-dma-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/pci-dma-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/pci-dma-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/pci-dma-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/bug.h>
int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);
-Index: head-2008-12-01/arch/x86/kernel/process_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/process_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/process_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/process_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -241,6 +241,7 @@ early_param("idle", idle_setup);
void show_regs(struct pt_regs * regs)
{
/*
* Leave lazy mode, flushing any hypercalls made here.
-Index: head-2008-12-01/arch/x86/kernel/setup_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/setup_32-xen.c 2008-12-01 11:36:07.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/setup_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/setup_32-xen.c 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/setup_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -114,19 +114,10 @@ static unsigned int highmem_pages = -1;
/*
* Setup options
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
-Index: head-2008-12-01/arch/x86/kernel/smp_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/smp_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/smp_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/smp_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/smp_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -22,6 +22,7 @@
#include <asm/mtrr.h>
{
if (per_cpu(cpu_tlbstate, cpu).state == TLBSTATE_OK)
BUG();
-Index: head-2008-12-01/arch/x86/kernel/time_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/time_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/time_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/time_32-xen.c 2009-03-24 10:11:31.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/time_32-xen.c 2009-03-24 10:12:09.000000000 +0100
@@ -76,11 +76,12 @@
#include <xen/evtchn.h>
#include <xen/interface/vcpu.h>
volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
#endif
-@@ -758,56 +759,10 @@ unsigned long read_persistent_clock(void
+@@ -756,56 +757,10 @@ unsigned long read_persistent_clock(void
return retval;
}
}
extern void (*late_time_init)(void);
-Index: head-2008-12-01/arch/x86/kernel/traps_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/traps_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/traps_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/traps_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/traps_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -41,6 +41,10 @@
#include <linux/mca.h>
#endif
#ifndef CONFIG_MATH_EMULATION
-Index: head-2008-12-01/arch/x86/mach-xen/setup.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mach-xen/setup.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/arch/x86/mach-xen/setup.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mach-xen/setup.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mach-xen/setup.c 2009-02-16 16:17:21.000000000 +0100
@@ -12,6 +12,7 @@
#include <asm/e820.h>
#include <asm/setup.h>
+ set_pmd(pmd, __pmd(__pa_symbol(swapper_pg_pmd) | _PAGE_TABLE));
+ }
}
-Index: head-2008-12-01/arch/x86/mm/fault_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/fault_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/fault_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/fault_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/fault_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -346,7 +346,10 @@ static inline pmd_t *vmalloc_sync_one(pg
pmd_k = pmd_offset(pud_k, address);
if (!pmd_present(*pmd_k))
tsk->thread.cr2 = address;
/* Kernel addresses are always protection faults */
tsk->thread.error_code = error_code | (address >= TASK_SIZE);
-Index: head-2008-12-01/arch/x86/mm/highmem_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/highmem_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/highmem_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/highmem_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/highmem_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -34,17 +34,16 @@ void *kmap_atomic_prot(struct page *page
/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
pagefault_disable();
}
void *kmap_atomic(struct page *page, enum km_type type)
-Index: head-2008-12-01/arch/x86/mm/init_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/init_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/init_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/init_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/init_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -96,7 +96,7 @@ static pte_t * __init one_page_table_ini
#endif
pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
if (!SHARED_KERNEL_PMD) {
/* If we're in PAE mode and have a non-shared
kernel pmd, then the pgd size must be a
-Index: head-2008-12-01/arch/x86/mm/ioremap_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/ioremap_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/ioremap_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/ioremap_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/ioremap_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -363,9 +363,8 @@ void iounmap(volatile void __iomem *addr
/* Reset the direct mapping. Can block */
PAGE_KERNEL);
global_flush_tlb();
}
-Index: head-2008-12-01/arch/x86/mm/pgtable_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/pgtable_32-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/pgtable_32-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/pgtable_32-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/pgtable_32-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -198,7 +198,7 @@ void pte_free(struct page *pte)
va, pfn_pte(pfn, PAGE_KERNEL), 0))
BUG();
(atomic_read(&mm->mm_count) == 1) &&
!mm->context.has_foreign_mappings)
mm_unpin(mm);
-Index: head-2008-12-01/arch/x86/pci/irq-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/pci/irq-xen.c 2008-12-01 11:32:38.000000000 +0100
-+++ head-2008-12-01/arch/x86/pci/irq-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/pci/irq-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/pci/irq-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -142,8 +142,9 @@ static void __init pirq_peer_trick(void)
for(i = 1; i < 256; i++) {
if (!busmap[i] || pci_find_bus(0, i))
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;
-Index: head-2008-12-01/arch/x86/xen/Kconfig
-===================================================================
---- head-2008-12-01.orig/arch/x86/xen/Kconfig 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/arch/x86/xen/Kconfig 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/xen/Kconfig 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/arch/x86/xen/Kconfig 2009-02-16 16:17:21.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen options
#
bool "Xen guest support"
select PARAVIRT
select PARAVIRT_CLOCK
-Index: head-2008-12-01/arch/x86/xen/xen-head.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/xen/xen-head.S 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/arch/x86/xen/xen-head.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/xen/xen-head.S 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/arch/x86/xen/xen-head.S 2009-02-16 16:17:21.000000000 +0100
@@ -1,7 +1,7 @@
/* Xen-specific pieces of head.S, intended to be included in the right
place in head.S */
-#endif /*CONFIG_XEN */
+#endif /* CONFIG_PARAVIRT_XEN */
-Index: head-2008-12-01/arch/x86/ia32/ia32entry-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/ia32/ia32entry-xen.S 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/ia32/ia32entry-xen.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/ia32/ia32entry-xen.S 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/ia32/ia32entry-xen.S 2009-02-16 16:17:21.000000000 +0100
@@ -105,7 +105,7 @@ ENTRY(ia32_sysenter_target)
movl $VSYSCALL32_SYSEXIT,8(%rsp)
movq %rax,(%rsp)
.quad sys_eventfd
+ .quad sys32_fallocate
ia32_syscall_end:
-Index: head-2008-12-01/arch/x86/kernel/acpi/sleep_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/acpi/sleep_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/acpi/sleep_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -51,12 +51,10 @@
Low-Level Sleep Support
-------------------------------------------------------------------------- */
void acpi_pci_link_exit(void)
{
}
-Index: head-2008-12-01/arch/x86/kernel/apic_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/apic_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/apic_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/apic_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/apic_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -50,7 +50,7 @@ void ack_bad_irq(unsigned int irq)
* holds up an irq slot - in excessive cases (when multiple
* unexpected vectors occur) that might lock up the APIC
irq_exit();
}
-Index: head-2008-12-01/arch/x86/kernel/e820_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/e820_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/e820_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/e820_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/e820_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -222,37 +222,6 @@ unsigned long __init e820_end_of_ram(voi
}
(unsigned long long) e820.map[i].addr,
(unsigned long long) (e820.map[i].addr + e820.map[i].size));
switch (e820.map[i].type) {
-Index: head-2008-12-01/arch/x86/kernel/early_printk-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/early_printk-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/early_printk-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/early_printk-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/early_printk-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -174,6 +174,7 @@ static __init void early_serial_init(cha
* mappings. Someone should fix this for domain 0. For now, use fake serial.
*/
}
if (keep_early)
-Index: head-2008-12-01/arch/x86/kernel/entry_64-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/entry_64-xen.S 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/entry_64-xen.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/entry_64-xen.S 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/entry_64-xen.S 2009-02-16 16:17:21.000000000 +0100
@@ -310,7 +310,7 @@ sysret_signal:
TRACE_IRQS_ON
/* sti */
jz retint_restore_args
TRACE_IRQS_ON
XEN_UNBLOCK_EVENTS(%rsi)
-Index: head-2008-12-01/arch/x86/kernel/head_64-xen.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/head_64-xen.S 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/head_64-xen.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/head_64-xen.S 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/head_64-xen.S 2009-02-16 16:17:21.000000000 +0100
@@ -23,7 +23,7 @@
#include <asm/dwarf2.h>
#include <xen/interface/elfnote.h>
+ ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel")
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
-Index: head-2008-12-01/arch/x86/kernel/head64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/head64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/head64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/head64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/head64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -90,7 +90,7 @@ void __init x86_64_start_kernel(char * r
unsigned long machine_to_phys_nr_ents;
int i;
xen_start_info = (struct start_info *)real_mode_data;
if (!xen_feature(XENFEAT_auto_translated_physmap))
-Index: head-2008-12-01/arch/x86/kernel/io_apic_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/io_apic_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/io_apic_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/io_apic_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -165,7 +165,9 @@ static inline void io_apic_write(unsigne
#endif
}
}
static struct irq_chip ioapic_chip __read_mostly = {
-Index: head-2008-12-01/arch/x86/kernel/ldt_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/ldt_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/ldt_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/ldt_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/ldt_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -114,6 +114,8 @@ int init_new_context(struct task_struct
memset(&mm->context, 0, sizeof(mm->context));
init_MUTEX(&mm->context.sem);
spin_lock(&mm_unpinned_lock);
list_del(&mm->context.unpinned);
spin_unlock(&mm_unpinned_lock);
-Index: head-2008-12-01/arch/x86/kernel/mpparse_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/mpparse_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/mpparse_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/mpparse_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -32,7 +32,6 @@
/* Have we found an MP table */
}
void __init
-Index: head-2008-12-01/arch/x86/kernel/process_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/process_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/process_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/process_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
}
void show_regs(struct pt_regs *regs)
-Index: head-2008-12-01/arch/x86/kernel/setup_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/setup_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/setup_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/setup_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/setup_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -827,6 +827,8 @@ static void __cpuinit init_amd(struct cp
level = cpuid_eax(1);
if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58))
};
static char *x86_power_flags[] = {
"ts", /* temperature sensor */
-Index: head-2008-12-01/arch/x86/kernel/setup64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/setup64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/setup64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/setup64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/setup64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -125,11 +125,14 @@ void __init setup_per_cpu_areas(void)
}
/* others are initialized in smpboot.c */
pda->pcurrent = &init_task;
pda->irqstackptr = boot_cpu_stack;
-Index: head-2008-12-01/arch/x86/kernel/smp_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/smp_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/smp_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/smp_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/smp_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -362,7 +362,7 @@ __smp_call_function_single(int cpu, void
}
put_cpu();
return 0;
}
-Index: head-2008-12-01/arch/x86/kernel/traps_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/traps_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/traps_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/traps_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/traps_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -34,6 +34,10 @@
#include <linux/bug.h>
#include <linux/kdebug.h>
if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing");
-Index: head-2008-12-01/arch/x86/kernel/vsyscall_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/vsyscall_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/vsyscall_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/vsyscall_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/vsyscall_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/segment.h>
#include <asm/desc.h>
write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
}
-Index: head-2008-12-01/arch/x86/mm/fault_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/fault_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/fault_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/fault_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/fault_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -159,7 +159,9 @@ void dump_pagetable(unsigned long addres
pmd_t *pmd;
pte_t *pte;
goto no_context;
do_sigbus:
-Index: head-2008-12-01/arch/x86/mm/init_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/init_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/init_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/init_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/init_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -66,6 +66,9 @@ int after_bootmem;
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
extern unsigned long start_pfn;
}
#endif
-@@ -1120,41 +1138,6 @@ int kern_addr_valid(unsigned long addr)
+@@ -1118,41 +1136,6 @@ int kern_addr_valid(unsigned long addr)
return pfn_valid(pte_pfn(*pte));
}
/* A pseudo VMA to allow ptrace access for the vsyscall page. This only
covers the 64bit vsyscall page now. 32bit has a real VMA now and does
not need special handling anymore. */
-@@ -1193,9 +1176,18 @@ int in_gate_area_no_task(unsigned long a
+@@ -1191,9 +1174,18 @@ int in_gate_area_no_task(unsigned long a
}
#ifndef CONFIG_XEN
+ return "[vsyscall]";
+ return NULL;
+}
-Index: head-2008-12-01/arch/x86/mm/pageattr_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/pageattr_64-xen.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/pageattr_64-xen.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/pageattr_64-xen.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/pageattr_64-xen.c 2009-02-16 16:17:21.000000000 +0100
@@ -171,7 +171,7 @@ void mm_pin(struct mm_struct *mm)
mm_walk(mm, PAGE_KERNEL_RO);
xen_pgd_pin(__pa(mm->pgd)); /* kernel */
ClearPagePrivate(pg);
__free_page(pg);
}
-Index: head-2008-12-01/arch/x86/vdso/vdso32/note.S
-===================================================================
---- head-2008-12-01.orig/arch/x86/vdso/vdso32/note.S 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/arch/x86/vdso/vdso32/note.S 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/vdso/vdso32/note.S 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/arch/x86/vdso/vdso32/note.S 2009-02-16 16:17:21.000000000 +0100
@@ -13,7 +13,7 @@ ELFNOTE_START(Linux, 0, "a")
.long LINUX_VERSION_CODE
ELFNOTE_END
.byte VDSO_NOTE_NONEGSEG_BIT; .asciz "nosegneg" /* bit, name */
ELFNOTE_END
#endif
-Index: head-2008-12-01/drivers/Makefile
-===================================================================
---- head-2008-12-01.orig/drivers/Makefile 2008-12-01 11:11:03.000000000 +0100
-+++ head-2008-12-01/drivers/Makefile 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/Makefile 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-05-14/drivers/Makefile 2009-02-16 16:17:21.000000000 +0100
@@ -16,7 +16,7 @@ obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_PNP) += pnp/
obj-$(CONFIG_ARM_AMBA) += amba/
# char/ comes before serial/ etc so that the VT console is the boot-time
# default.
-Index: head-2008-12-01/drivers/block/Kconfig
-===================================================================
---- head-2008-12-01.orig/drivers/block/Kconfig 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/drivers/block/Kconfig 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/block/Kconfig 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/block/Kconfig 2009-02-16 16:17:21.000000000 +0100
@@ -423,9 +423,9 @@ config XILINX_SYSACE
help
Include support for the Xilinx SystemACE CompactFlash interface
default y
help
This driver implements the front-end of the Xen virtual
-Index: head-2008-12-01/drivers/block/Makefile
-===================================================================
---- head-2008-12-01.orig/drivers/block/Makefile 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/drivers/block/Makefile 2008-12-01 11:36:47.000000000 +0100
-@@ -31,4 +31,4 @@ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
+--- sle11-2009-05-14.orig/drivers/block/Makefile 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/block/Makefile 2009-02-16 16:17:21.000000000 +0100
+@@ -31,5 +31,5 @@ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
obj-$(CONFIG_BLK_DEV_HD) += hd.o
-obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
+obj-$(CONFIG_XEN_BLKFRONT) += xen-blkfront.o
-Index: head-2008-12-01/drivers/block/xen-blkfront.c
-===================================================================
---- head-2008-12-01.orig/drivers/block/xen-blkfront.c 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/drivers/block/xen-blkfront.c 2008-12-01 11:36:47.000000000 +0100
+ obj-$(CONFIG_CIPHER_TWOFISH) += loop_fish2.o
+--- sle11-2009-05-14.orig/drivers/block/xen-blkfront.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/block/xen-blkfront.c 2009-02-16 16:17:21.000000000 +0100
@@ -1021,7 +1021,6 @@ static struct xenbus_device_id blkfront_
static struct xenbus_driver blkfront = {
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
-Index: head-2008-12-01/drivers/char/Kconfig
-===================================================================
---- head-2008-12-01.orig/drivers/char/Kconfig 2008-11-10 11:49:15.000000000 +0100
-+++ head-2008-12-01/drivers/char/Kconfig 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/char/Kconfig 2009-02-16 15:58:02.000000000 +0100
++++ sle11-2009-05-14/drivers/char/Kconfig 2009-02-16 16:17:21.000000000 +0100
@@ -624,7 +624,7 @@ config HVC_BEAT
config HVC_XEN
select HVC_DRIVER
select HVC_IRQ
default y
-Index: head-2008-12-01/drivers/net/Kconfig
-===================================================================
---- head-2008-12-01.orig/drivers/net/Kconfig 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/drivers/net/Kconfig 2008-12-01 11:36:47.000000000 +0100
-@@ -2535,9 +2535,9 @@ source "drivers/atm/Kconfig"
+--- sle11-2009-05-14.orig/drivers/net/Kconfig 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/net/Kconfig 2009-02-16 16:17:21.000000000 +0100
+@@ -2545,9 +2545,9 @@ source "drivers/atm/Kconfig"
source "drivers/s390/net/Kconfig"
default y
help
The network device frontend driver allows the kernel to
-Index: head-2008-12-01/drivers/net/Makefile
-===================================================================
---- head-2008-12-01.orig/drivers/net/Makefile 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/drivers/net/Makefile 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/net/Makefile 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/net/Makefile 2009-02-16 16:17:21.000000000 +0100
@@ -142,7 +142,7 @@ obj-$(CONFIG_PPPOL2TP) += pppox.o pppol2
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_IFB) += ifb.o
-Index: head-2008-12-01/drivers/net/xen-netfront.c
-===================================================================
---- head-2008-12-01.orig/drivers/net/xen-netfront.c 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/drivers/net/xen-netfront.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/net/xen-netfront.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/net/xen-netfront.c 2009-02-16 16:17:21.000000000 +0100
@@ -36,8 +36,6 @@
#include <linux/skbuff.h>
#include <linux/ethtool.h>
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(xennet_remove),
-Index: head-2008-12-01/drivers/xen/Makefile
-===================================================================
---- head-2008-12-01.orig/drivers/xen/Makefile 2008-12-01 11:22:58.000000000 +0100
-+++ head-2008-12-01/drivers/xen/Makefile 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/Makefile 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/Makefile 2009-02-16 16:17:21.000000000 +0100
@@ -1,10 +1,12 @@
-obj-y += core/
-obj-y += console/
obj-$(CONFIG_XEN_BALLOON) += balloon/
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
-Index: head-2008-12-01/drivers/xen/blkback/blkback.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkback/blkback.c 2008-12-01 11:32:38.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blkback/blkback.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blkback/blkback.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkback/blkback.c 2009-02-16 16:17:21.000000000 +0100
@@ -154,7 +154,7 @@ static void unplug_queue(blkif_t *blkif)
static void plug_queue(blkif_t *blkif, struct block_device *bdev)
if (q == blkif->plug)
return;
-Index: head-2008-12-01/drivers/xen/blkback/common.h
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkback/common.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blkback/common.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blkback/common.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkback/common.h 2009-02-16 16:17:21.000000000 +0100
@@ -79,7 +79,7 @@ typedef struct blkif_st {
wait_queue_head_t wq;
struct task_struct *xenblkd;
/* statistics */
unsigned long st_print;
-Index: head-2008-12-01/drivers/xen/blkback/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkback/interface.c 2008-12-01 11:32:38.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blkback/interface.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blkback/interface.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkback/interface.c 2009-02-16 16:17:21.000000000 +0100
@@ -177,5 +177,5 @@ void blkif_free(blkif_t *blkif)
void __init blkif_interface_init(void)
{
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
-Index: head-2008-12-01/drivers/xen/blkfront/blkfront.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkfront/blkfront.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blkfront/blkfront.c 2008-12-01 11:36:47.000000000 +0100
-@@ -667,7 +667,7 @@ static int blkif_queue_request(struct re
+--- sle11-2009-05-14.orig/drivers/xen/blkfront/blkfront.c 2009-03-24 10:11:24.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkfront/blkfront.c 2009-03-24 10:12:03.000000000 +0100
+@@ -662,7 +662,7 @@ static int blkif_queue_request(struct re
* do_blkif_request
* read a block; request is in a request queue
*/
{
struct blkfront_info *info = NULL;
struct request *req;
-Index: head-2008-12-01/drivers/xen/blkfront/block.h
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkfront/block.h 2008-08-07 12:44:36.000000000 +0200
-+++ head-2008-12-01/drivers/xen/blkfront/block.h 2008-12-01 11:36:47.000000000 +0100
-@@ -105,7 +105,7 @@ struct blkfront_info
- blkif_front_ring_t ring;
+--- sle11-2009-05-14.orig/drivers/xen/blkfront/block.h 2009-03-05 15:42:00.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkfront/block.h 2009-03-24 10:11:58.000000000 +0100
+@@ -106,7 +106,7 @@ struct blkfront_info
+ struct scatterlist sg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
unsigned int irq;
struct xlbd_major_info *mi;
- request_queue_t *rq;
struct work_struct work;
struct gnttab_free_callback callback;
struct blk_shadow shadow[BLK_RING_SIZE];
-@@ -129,7 +129,7 @@ extern int blkif_ioctl(struct inode *ino
+@@ -130,7 +130,7 @@ extern int blkif_ioctl(struct inode *ino
extern int blkif_getgeo(struct block_device *, struct hd_geometry *);
extern int blkif_check(dev_t dev);
extern int blkif_revalidate(dev_t dev);
/* Virtual block-device subsystem. */
/* Note that xlvbd_add doesn't call add_disk for you: you're expected
-Index: head-2008-12-01/drivers/xen/blkfront/vbd.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blkfront/vbd.c 2008-08-07 12:44:36.000000000 +0200
-+++ head-2008-12-01/drivers/xen/blkfront/vbd.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blkfront/vbd.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/blkfront/vbd.c 2009-02-16 16:17:21.000000000 +0100
@@ -211,7 +211,7 @@ xlbd_put_major_info(struct xlbd_major_in
static int
xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
if (rq == NULL)
-Index: head-2008-12-01/drivers/xen/blktap/common.h
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blktap/common.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blktap/common.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blktap/common.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blktap/common.h 2009-02-16 16:17:21.000000000 +0100
@@ -68,7 +68,7 @@ typedef struct blkif_st {
wait_queue_head_t wq;
struct task_struct *xenblkd;
/* statistics */
unsigned long st_print;
-Index: head-2008-12-01/drivers/xen/blktap/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/blktap/interface.c 2008-12-01 11:32:38.000000000 +0100
-+++ head-2008-12-01/drivers/xen/blktap/interface.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/blktap/interface.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blktap/interface.c 2009-02-16 16:17:21.000000000 +0100
@@ -177,5 +177,5 @@ void tap_blkif_kmem_cache_free(blkif_t *
void __init tap_blkif_interface_init(void)
{
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
-Index: head-2008-12-01/drivers/xen/core/features.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/core/features.c 2007-06-12 13:13:44.000000000 +0200
-+++ head-2008-12-01/drivers/xen/core/features.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/core/features.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/core/features.c 2009-02-16 16:17:21.000000000 +0100
@@ -19,7 +19,7 @@ u8 xen_features[XENFEAT_NR_SUBMAPS * 32]
/* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
EXPORT_SYMBOL(xen_features);
{
xen_feature_info_t fi;
int i, j;
-Index: head-2008-12-01/drivers/xen/core/reboot.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/core/reboot.c 2008-12-01 11:32:38.000000000 +0100
-+++ head-2008-12-01/drivers/xen/core/reboot.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/core/reboot.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/core/reboot.c 2009-02-16 16:17:21.000000000 +0100
@@ -4,6 +4,7 @@
#include <linux/unistd.h>
#include <linux/module.h>
#include <linux/sysrq.h>
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
-Index: head-2008-12-01/drivers/xen/scsiback/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/scsiback/interface.c 2008-12-01 11:32:38.000000000 +0100
-+++ head-2008-12-01/drivers/xen/scsiback/interface.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/scsiback/interface.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/scsiback/interface.c 2009-02-16 16:17:21.000000000 +0100
@@ -167,7 +167,7 @@ void scsiback_free(struct vscsibk_info *
int __init scsiback_interface_init(void)
{
if (!scsiback_cachep) {
printk(KERN_ERR "scsiback: can't init scsi cache\n");
return -ENOMEM;
-Index: head-2008-12-01/drivers/xen/scsifront/scsifront.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/scsifront/scsifront.c 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/drivers/xen/scsifront/scsifront.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/scsifront/scsifront.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/scsifront/scsifront.c 2009-02-16 16:17:21.000000000 +0100
@@ -147,7 +147,7 @@ static void scsifront_cdb_cmd_done(struc
add_id_to_freelist(info, id);
if (ring_res->sense_len > VSCSIIF_SENSE_BUFFERSIZE)
sense_len = VSCSIIF_SENSE_BUFFERSIZE;
-Index: head-2008-12-01/drivers/xen/tpmback/interface.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/tpmback/interface.c 2008-12-01 11:36:07.000000000 +0100
-+++ head-2008-12-01/drivers/xen/tpmback/interface.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/tpmback/interface.c 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/tpmback/interface.c 2009-02-16 16:17:21.000000000 +0100
@@ -12,6 +12,7 @@
*/
return tpmif_cachep ? 0 : -ENOMEM;
}
-Index: head-2008-12-01/drivers/xen/util.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
-+++ head-2008-12-01/drivers/xen/util.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/util.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/util.c 2009-02-16 16:17:21.000000000 +0100
@@ -1,8 +1,5 @@
-#include <linux/mm.h>
+#include <linux/err.h>
-}
-EXPORT_SYMBOL_GPL(free_vm_area);
-#endif /* CONFIG_X86 */
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_client.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_client.c 2008-12-01 11:22:58.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_client.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_client.c 2009-03-17 15:27:31.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_client.c 2009-03-24 10:12:22.000000000 +0100
@@ -30,19 +30,26 @@
* IN THE SOFTWARE.
*/
const char *xenbus_strstate(enum xenbus_state state)
{
static const char *const name[] = {
-@@ -58,6 +65,20 @@ const char *xenbus_strstate(enum xenbus_
+@@ -60,6 +67,20 @@ const char *xenbus_strstate(enum xenbus_
}
EXPORT_SYMBOL_GPL(xenbus_strstate);
int xenbus_watch_path(struct xenbus_device *dev, const char *path,
struct xenbus_watch *watch,
void (*callback)(struct xenbus_watch *,
-@@ -81,6 +102,7 @@ int xenbus_watch_path(struct xenbus_devi
+@@ -83,6 +104,7 @@ int xenbus_watch_path(struct xenbus_devi
EXPORT_SYMBOL_GPL(xenbus_watch_path);
int xenbus_watch_path2(struct xenbus_device *dev, const char *path,
const char *path2, struct xenbus_watch *watch,
void (*callback)(struct xenbus_watch *,
-@@ -99,8 +121,60 @@ int xenbus_watch_path2(struct xenbus_dev
+@@ -101,8 +123,60 @@ int xenbus_watch_path2(struct xenbus_dev
return err;
}
EXPORT_SYMBOL_GPL(xenbus_watch_path2);
int xenbus_switch_state(struct xenbus_device *dev, enum xenbus_state state)
{
/* We check whether the state is currently set to the given value, and
-@@ -159,8 +233,8 @@ static char *error_path(struct xenbus_de
+@@ -161,8 +235,8 @@ static char *error_path(struct xenbus_de
}
{
int ret;
unsigned int len;
-@@ -181,14 +255,16 @@ void _dev_error(struct xenbus_device *de
+@@ -183,14 +257,16 @@ void _dev_error(struct xenbus_device *de
path_buffer = error_path(dev);
if (path_buffer == NULL) {
goto fail;
}
-@@ -200,6 +276,15 @@ fail:
+@@ -202,6 +278,15 @@ fail:
}
void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt,
...)
{
-@@ -212,6 +297,16 @@ void xenbus_dev_error(struct xenbus_devi
+@@ -214,6 +299,16 @@ void xenbus_dev_error(struct xenbus_devi
EXPORT_SYMBOL_GPL(xenbus_dev_error);
void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
...)
{
-@@ -226,6 +321,15 @@ void xenbus_dev_fatal(struct xenbus_devi
+@@ -228,6 +323,15 @@ void xenbus_dev_fatal(struct xenbus_devi
EXPORT_SYMBOL_GPL(xenbus_dev_fatal);
int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn)
{
int err = gnttab_grant_foreign_access(dev->otherend_id, ring_mfn, 0);
-@@ -236,6 +340,12 @@ int xenbus_grant_ring(struct xenbus_devi
+@@ -238,6 +342,12 @@ int xenbus_grant_ring(struct xenbus_devi
EXPORT_SYMBOL_GPL(xenbus_grant_ring);
int xenbus_alloc_evtchn(struct xenbus_device *dev, int *port)
{
struct evtchn_alloc_unbound alloc_unbound;
-@@ -256,6 +366,38 @@ int xenbus_alloc_evtchn(struct xenbus_de
+@@ -258,6 +368,38 @@ int xenbus_alloc_evtchn(struct xenbus_de
EXPORT_SYMBOL_GPL(xenbus_alloc_evtchn);
int xenbus_free_evtchn(struct xenbus_device *dev, int port)
{
struct evtchn_close close;
-@@ -272,6 +414,191 @@ int xenbus_free_evtchn(struct xenbus_dev
+@@ -274,6 +416,191 @@ int xenbus_free_evtchn(struct xenbus_dev
EXPORT_SYMBOL_GPL(xenbus_free_evtchn);
enum xenbus_state xenbus_read_driver_state(const char *path)
{
enum xenbus_state result;
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_comms.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_comms.c 2008-12-01 11:32:38.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_comms.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_comms.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_comms.c 2009-02-16 16:17:21.000000000 +0100
@@ -34,12 +34,15 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
xen_store_evtchn, wake_waiting,
0, "xenbus", &xb_waitq);
if (err <= 0) {
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_probe.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_probe.c 2008-12-01 11:36:07.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_probe.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.c 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.c 2009-02-16 16:17:21.000000000 +0100
@@ -43,12 +43,11 @@
#include <linux/mm.h>
#include <linux/notifier.h>
{
return xenbus_probe_init();
}
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_probe.h
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_probe.h 2008-12-01 11:36:07.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_probe.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.h 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.h 2009-02-16 16:17:21.000000000 +0100
@@ -56,7 +56,9 @@ struct xen_bus_type
int (*get_bus_id)(char bus_id[BUS_ID_SIZE], const char *nodename);
int (*probe)(const char *type, const char *dir);
#endif
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_probe_backend.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2008-12-01 11:36:07.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_probe_backend.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe_backend.c 2009-02-16 16:17:21.000000000 +0100
@@ -236,7 +236,7 @@ static void backend_changed(struct xenbu
{
DPRINTK("");
}
static struct xenbus_watch be_watch = {
-Index: head-2008-12-01/drivers/xen/xenbus/xenbus_xs.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/xenbus/xenbus_xs.c 2008-12-01 11:22:58.000000000 +0100
-+++ head-2008-12-01/drivers/xen/xenbus/xenbus_xs.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_xs.c 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_xs.c 2009-02-16 16:17:21.000000000 +0100
@@ -221,7 +221,7 @@ static void *xs_talkv(struct xenbus_tran
}
}
return 0;
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/fixmap_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/fixmap_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/fixmap_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/fixmap_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/fixmap_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -53,6 +53,8 @@ extern unsigned long __FIXADDR_TOP;
enum fixed_addresses {
FIX_HOLE,
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
#endif
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/highmem.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/highmem.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/highmem.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/highmem.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/highmem.h 2009-02-16 16:17:21.000000000 +0100
@@ -76,8 +76,7 @@ struct page *kmap_atomic_to_page(void *p
#define kmap_atomic_pte(page, type) \
#define flush_cache_kmaps() do { } while (0)
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/io_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/io_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/io_32.h 2008-12-01 11:36:47.000000000 +0100
-@@ -125,6 +125,9 @@ extern void __iomem * __ioremap(unsigned
- * writew/writel functions and the other mmio helpers. The returned
- * address is not guaranteed to be usable directly as a virtual
- * address.
-+ *
-+ * If the area you are trying to map is a PCI BAR you should have a
-+ * look at pci_iomap().
- */
-
- static inline void __iomem * ioremap(unsigned long offset, unsigned long size)
-@@ -142,6 +145,7 @@ extern void iounmap(volatile void __iome
- */
- extern void *bt_ioremap(unsigned long offset, unsigned long size);
- extern void bt_iounmap(void *addr, unsigned long size);
-+extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
-
- /* Use early IO mappings for DMI because it's initialized early */
- #define dmi_ioremap bt_ioremap
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/maddr_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/maddr_32.h 2008-04-02 12:34:02.000000000 +0200
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/maddr_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/maddr_32.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/maddr_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -155,6 +155,7 @@ static inline paddr_t pte_machine_to_phy
#ifdef CONFIG_X86_PAE
static inline pte_t pfn_pte_ma(unsigned long page_nr, pgprot_t pgprot)
{
pte_t pte;
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/mmu_context_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/mmu_context_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -16,7 +16,7 @@ void mm_pin_all(void);
static inline void xen_activate_mm(struct mm_struct *prev,
struct mm_struct *next)
/* stop flush ipis for the previous mm */
cpu_clear(cpu, prev->cpu_vm_mask);
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pci_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pci_32.h 2007-09-14 11:14:51.000000000 +0200
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pci_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pci_32.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pci_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -3,6 +3,14 @@
#ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat,
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgalloc_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgalloc_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgalloc_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgalloc_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgalloc_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -5,7 +5,7 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
if (!PageHighMem(pte)) \
BUG_ON(HYPERVISOR_update_va_mapping( \
(unsigned long)__va(pfn << PAGE_SHIFT), \
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -26,9 +26,6 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
xen_l1_entry_update(ptep, __pte(0)); \
else \
*(ptep) = __pte(0); \
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable-3level.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgtable-3level.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable-3level.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable-3level.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable-3level.h 2009-02-16 16:17:21.000000000 +0100
@@ -23,26 +23,11 @@
#define pud_present(pud) 1
}
/* Rules for using set_pte: the pte being assigned *must* be
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/processor_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -89,7 +89,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
/*
* Size of io_bitmap.
*/
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/system_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/system_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/system_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/system_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/system_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -205,11 +205,6 @@ static inline unsigned long get_limit(un
*/
extern unsigned long arch_align_stack(unsigned long sp);
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/tlbflush_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/tlbflush_32.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/tlbflush_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/tlbflush_32.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/tlbflush_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -91,7 +91,11 @@ struct tlb_state
DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate);
#endif /* SMP */
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/fixmap_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/fixmap_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/fixmap_64.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/fixmap_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/fixmap_64.h 2009-02-16 16:17:21.000000000 +0100
@@ -23,9 +23,9 @@
* compile time, but to set the physical address only
* in the boot process.
}
#endif
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/io_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/io_64.h 2008-12-01 11:36:07.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/io_64.h 2008-12-01 11:36:47.000000000 +0100
-@@ -162,6 +162,7 @@ extern void bt_iounmap(void *addr, unsig
- */
- extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
- extern void iounmap(volatile void __iomem *addr);
-+extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
-
- /*
- * ISA I/O bus memory addresses are 1:1 with the physical address.
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/mmu_context_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/mmu_context_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/mmu_context_64.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/mmu_context_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/mmu_context_64.h 2009-02-16 16:17:21.000000000 +0100
@@ -76,7 +76,7 @@ static inline void switch_mm(struct mm_s
if (likely(prev != next)) {
mm_pin(next);
switch_mm(prev, next, NULL);
}
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/page_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/page_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/page_64.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/page_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/page_64.h 2009-02-16 16:17:21.000000000 +0100
@@ -72,7 +72,8 @@ void copy_page(void *, void *);
#define clear_user_page(page, vaddr, pg) clear_page(page)
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
/*
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pci_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pci_64.h 2007-09-14 11:14:51.000000000 +0200
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pci_64.h 2008-12-01 11:36:47.000000000 +0100
-@@ -5,6 +5,27 @@
-
- #ifdef __KERNEL__
-
-+struct pci_sysdata {
-+ int node; /* NUMA node */
-+ void* iommu; /* IOMMU private data */
-+};
-+
-+extern struct pci_bus *pci_scan_bus_with_sysdata(int busno);
-+
-+#ifdef CONFIG_CALGARY_IOMMU
-+static inline void* pci_iommu(struct pci_bus *bus)
-+{
-+ struct pci_sysdata *sd = bus->sysdata;
-+ return sd->iommu;
-+}
-+
-+static inline void set_pci_iommu(struct pci_bus *bus, void *val)
-+{
-+ struct pci_sysdata *sd = bus->sysdata;
-+ sd->iommu = val;
-+}
-+#endif /* CONFIG_CALGARY_IOMMU */
-+
- #include <linux/mm.h> /* for struct page */
-
- /* Can be used to override the logic in pci_scan_bus for skipping
-@@ -56,14 +77,6 @@ extern int iommu_setup(char *opt);
-
- #if defined(CONFIG_IOMMU) || defined(CONFIG_CALGARY_IOMMU)
-
--/*
-- * x86-64 always supports DAC, but sometimes it is useful to force
-- * devices through the IOMMU to get automatic sg list merging.
-- * Optional right now.
-- */
--extern int iommu_sac_force;
--#define pci_dac_dma_supported(pci_dev, mask) (!iommu_sac_force)
--
- #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \
- dma_addr_t ADDR_NAME;
- #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \
-@@ -97,8 +110,6 @@ extern int iommu_sac_force;
- #else
- /* No IOMMU */
-
--#define pci_dac_dma_supported(pci_dev, mask) 1
--
- #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
- #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
- #define pci_unmap_addr(PTR, ADDR_NAME) (0)
-@@ -110,36 +121,6 @@ extern int iommu_sac_force;
-
- #include <asm-generic/pci-dma-compat.h>
-
--static inline dma64_addr_t
--pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page, unsigned long offset, int direction)
--{
-- return ((dma64_addr_t) page_to_phys(page) +
-- (dma64_addr_t) offset);
--}
--
--static inline struct page *
--pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr)
--{
-- return virt_to_page(__va(dma_addr));
--}
--
--static inline unsigned long
--pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr)
--{
-- return (dma_addr & ~PAGE_MASK);
--}
--
--static inline void
--pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev, dma64_addr_t dma_addr, size_t len, int direction)
--{
--}
--
--static inline void
--pci_dac_dma_sync_single_for_device(struct pci_dev *pdev, dma64_addr_t dma_addr, size_t len, int direction)
--{
-- flush_write_buffers();
--}
--
- #ifdef CONFIG_PCI
- static inline void pci_dma_burst_advice(struct pci_dev *pdev,
- enum pci_dma_burst_strategy *strat,
-@@ -154,10 +135,6 @@ static inline void pci_dma_burst_advice(
- extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
- enum pci_mmap_state mmap_state, int write_combine);
-
--static inline void pcibios_add_platform_entries(struct pci_dev *dev)
--{
--}
--
- #endif /* __KERNEL__ */
-
- /* generic pci stuff */
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgalloc_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgalloc_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgalloc_64.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgalloc_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgalloc_64.h 2009-02-16 16:17:21.000000000 +0100
@@ -21,7 +21,7 @@ static inline void pmd_populate_kernel(s
static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)
BUG_ON(HYPERVISOR_update_va_mapping(
(unsigned long)pud,
pfn_pte(virt_to_phys(pud)>>PAGE_SHIFT,
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-01 11:36:47.000000000 +0100
-@@ -302,7 +302,7 @@ static inline pte_t ptep_get_and_clear_f
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-02-16 16:17:21.000000000 +0100
+@@ -304,7 +304,7 @@ static inline pte_t ptep_get_and_clear_f
{
if (full) {
pte_t pte = *ptep;
xen_l1_entry_update(ptep, __pte(0));
else
*ptep = __pte(0);
-@@ -331,21 +331,15 @@ static inline pte_t ptep_get_and_clear_f
+@@ -333,21 +333,15 @@ static inline pte_t ptep_get_and_clear_f
* Undefined behaviour if not..
*/
#define __LARGE_PTE (_PAGE_PSE|_PAGE_PRESENT)
static inline pte_t pte_mkexec(pte_t pte) { __pte_val(pte) &= ~_PAGE_NX; return pte; }
static inline pte_t pte_mkdirty(pte_t pte) { __pte_val(pte) |= _PAGE_DIRTY; return pte; }
static inline pte_t pte_mkyoung(pte_t pte) { __pte_val(pte) |= _PAGE_ACCESSED; return pte; }
-@@ -353,13 +347,6 @@ static inline pte_t pte_mkwrite(pte_t pt
+@@ -355,13 +349,6 @@ static inline pte_t pte_mkwrite(pte_t pt
static inline pte_t pte_mkhuge(pte_t pte) { __pte_val(pte) |= _PAGE_PSE; return pte; }
static inline pte_t pte_clrhuge(pte_t pte) { __pte_val(pte) &= ~_PAGE_PSE; return pte; }
static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
{
if (!pte_young(*ptep))
-@@ -498,26 +485,13 @@ static inline pte_t pte_modify(pte_t pte
+@@ -500,26 +487,13 @@ static inline pte_t pte_modify(pte_t pte
__changed; \
})
(void)ptep_set_access_flags(vma, address, ptep, __pte, __young); \
else if (__young) \
set_pte(ptep, __pte); \
-@@ -568,6 +542,8 @@ int xen_change_pte_range(struct mm_struc
+@@ -570,6 +544,8 @@ int xen_change_pte_range(struct mm_struc
#define arch_change_pte_range(mm, pmd, addr, end, newprot, dirty_accountable) \
xen_change_pte_range(mm, pmd, addr, end, newprot, dirty_accountable)
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
direct_remap_pfn_range(vma,vaddr,pfn,size,prot,DOMID_IO)
-@@ -585,7 +561,6 @@ int xen_change_pte_range(struct mm_struc
+@@ -587,7 +563,6 @@ int xen_change_pte_range(struct mm_struc
(((o) & (1UL << (__VIRTUAL_MASK_SHIFT-1))) ? ((o) | (~__VIRTUAL_MASK)) : (o))
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/processor_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/processor_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/processor_64.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_64.h 2009-02-16 16:17:21.000000000 +0100
@@ -83,7 +83,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
static inline void serialize_cpu(void)
{
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/system_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/system_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/system_64.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/system_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/system_64.h 2009-02-16 16:17:21.000000000 +0100
@@ -79,12 +79,16 @@ static inline unsigned long read_cr0(voi
unsigned long cr0;
asm volatile("movq %%cr0,%0" : "=r" (cr0));
#endif /* __KERNEL__ */
#define nop() __asm__ __volatile__ ("nop")
-Index: head-2008-12-01/include/asm-x86/mach-xen/asm/tlbflush_64.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/mach-xen/asm/tlbflush_64.h 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/mach-xen/asm/tlbflush_64.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/tlbflush_64.h 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/tlbflush_64.h 2009-02-16 16:17:21.000000000 +0100
@@ -89,7 +89,11 @@ static inline void flush_tlb_range(struc
#endif
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
-Index: head-2008-12-01/include/asm-x86/thread_info.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/thread_info.h 2008-12-01 11:28:55.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/thread_info.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/thread_info.h 2009-04-20 11:36:10.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/thread_info.h 2009-02-16 16:17:21.000000000 +0100
@@ -150,7 +150,8 @@ struct thread_info {
#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)
#endif
#define PREEMPT_ACTIVE 0x10000000
-Index: head-2008-12-01/include/asm-x86/xen/interface.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/xen/interface.h 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/xen/interface.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/xen/interface.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/xen/interface.h 2009-02-16 16:17:21.000000000 +0100
@@ -10,17 +10,17 @@
#define __ASM_X86_XEN_INTERFACE_H
#endif /* !__ASSEMBLY__ */
/*
-Index: head-2008-12-01/include/asm-x86/xen/interface_32.h
-===================================================================
---- head-2008-12-01.orig/include/asm-x86/xen/interface_32.h 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/include/asm-x86/xen/interface_32.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/asm-x86/xen/interface_32.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/xen/interface_32.h 2009-02-16 16:17:21.000000000 +0100
@@ -62,7 +62,7 @@ struct cpu_user_regs {
uint16_t fs, _pad4;
uint16_t gs, _pad5;
typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */
-Index: head-2008-12-01/include/linux/elfnote.h
-===================================================================
---- head-2008-12-01.orig/include/linux/elfnote.h 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/include/linux/elfnote.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/linux/elfnote.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/linux/elfnote.h 2009-02-16 16:17:21.000000000 +0100
@@ -52,7 +52,7 @@
4484:.balign 4 ; \
.popsection ;
ELFNOTE_START(name, type, "") \
desc ; \
ELFNOTE_END
-Index: head-2008-12-01/include/linux/page-flags.h
-===================================================================
---- head-2008-12-01.orig/include/linux/page-flags.h 2008-12-01 11:25:57.000000000 +0100
-+++ head-2008-12-01/include/linux/page-flags.h 2008-12-01 11:36:47.000000000 +0100
-@@ -99,6 +99,10 @@ enum pageflags {
+--- sle11-2009-05-14.orig/include/linux/page-flags.h 2009-01-16 10:20:18.000000000 +0100
++++ sle11-2009-05-14/include/linux/page-flags.h 2009-02-16 16:17:21.000000000 +0100
+@@ -100,6 +100,10 @@ enum pageflags {
#endif
#ifdef CONFIG_XEN
PG_foreign, /* Page is owned by foreign allocator. */
#endif
__NR_PAGEFLAGS,
-Index: head-2008-12-01/include/linux/skbuff.h
-===================================================================
---- head-2008-12-01.orig/include/linux/skbuff.h 2008-12-01 11:29:05.000000000 +0100
-+++ head-2008-12-01/include/linux/skbuff.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/linux/skbuff.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/include/linux/skbuff.h 2009-02-16 16:17:21.000000000 +0100
@@ -1772,7 +1772,7 @@ static inline void skb_forward_csum(stru
bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
int skb_checksum_setup(struct sk_buff *skb);
#else
static inline int skb_checksum_setup(struct sk_buff *skb) { return 0; }
-Index: head-2008-12-01/include/xen/driver_util.h
-===================================================================
---- head-2008-12-01.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
-+++ head-2008-12-01/include/xen/driver_util.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/driver_util.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/xen/driver_util.h 2009-02-16 16:17:21.000000000 +0100
@@ -5,10 +5,6 @@
#include <linux/vmalloc.h>
#include <linux/device.h>
extern struct class *get_xen_class(void);
#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
-Index: head-2008-12-01/include/xen/features.h
-===================================================================
---- head-2008-12-01.orig/include/xen/features.h 2008-12-01 10:53:14.000000000 +0100
-+++ head-2008-12-01/include/xen/features.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/features.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/xen/features.h 2009-02-16 16:17:21.000000000 +0100
@@ -10,6 +10,7 @@
#define __XEN_FEATURES_H__
-#endif /* __ASM_XEN_FEATURES_H__ */
+#endif /* __XEN_FEATURES_H__ */
-Index: head-2008-12-01/include/xen/interface/arch-x86/xen.h
-===================================================================
---- head-2008-12-01.orig/include/xen/interface/arch-x86/xen.h 2008-09-01 12:07:31.000000000 +0200
-+++ head-2008-12-01/include/xen/interface/arch-x86/xen.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/interface/arch-x86/xen.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/xen/interface/arch-x86/xen.h 2009-02-16 16:17:21.000000000 +0100
@@ -49,6 +49,9 @@
#define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0)
#endif
#if defined(__i386__)
#include "xen-x86_32.h"
#elif defined(__x86_64__)
-Index: head-2008-12-01/include/xen/interface/event_channel.h
-===================================================================
---- head-2008-12-01.orig/include/xen/interface/event_channel.h 2008-12-01 11:22:58.000000000 +0100
-+++ head-2008-12-01/include/xen/interface/event_channel.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/interface/event_channel.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/include/xen/interface/event_channel.h 2009-02-16 16:17:21.000000000 +0100
@@ -248,6 +248,7 @@ struct evtchn_op {
struct evtchn_unmask unmask;
} u;
typedef struct evtchn_op evtchn_op_t;
DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
-Index: head-2008-12-01/include/xen/interface/io/netif.h
-===================================================================
---- head-2008-12-01.orig/include/xen/interface/io/netif.h 2008-12-01 11:22:58.000000000 +0100
-+++ head-2008-12-01/include/xen/interface/io/netif.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/interface/io/netif.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/include/xen/interface/io/netif.h 2009-02-16 16:17:21.000000000 +0100
@@ -183,8 +183,22 @@ typedef struct netif_rx_response netif_r
* Generate netif ring structures and types.
*/
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
-Index: head-2008-12-01/include/xen/interface/memory.h
-===================================================================
---- head-2008-12-01.orig/include/xen/interface/memory.h 2008-12-01 11:22:59.000000000 +0100
-+++ head-2008-12-01/include/xen/interface/memory.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/interface/memory.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/include/xen/interface/memory.h 2009-02-16 16:17:21.000000000 +0100
@@ -82,6 +82,7 @@ struct xen_memory_reservation {
domid_t domid;
typedef struct xen_translate_gpfn_list xen_translate_gpfn_list_t;
DEFINE_XEN_GUEST_HANDLE(xen_translate_gpfn_list_t);
-Index: head-2008-12-01/include/xen/interface/sched.h
-===================================================================
---- head-2008-12-01.orig/include/xen/interface/sched.h 2008-12-01 11:22:59.000000000 +0100
-+++ head-2008-12-01/include/xen/interface/sched.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/interface/sched.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/include/xen/interface/sched.h 2009-02-16 16:17:21.000000000 +0100
@@ -67,6 +67,7 @@
struct sched_shutdown {
unsigned int reason; /* SHUTDOWN_* */
typedef struct sched_poll sched_poll_t;
DEFINE_XEN_GUEST_HANDLE(sched_poll_t);
-Index: head-2008-12-01/include/xen/interface/version.h
-===================================================================
---- head-2008-12-01.orig/include/xen/interface/version.h 2008-12-01 11:22:59.000000000 +0100
-+++ head-2008-12-01/include/xen/interface/version.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/interface/version.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/include/xen/interface/version.h 2009-02-16 16:17:21.000000000 +0100
@@ -36,6 +36,9 @@
/* arg == xen_extraversion_t. */
#define XENVER_extraversion 1
#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
#define XENVER_platform_parameters 5
-Index: head-2008-12-01/include/xen/interface/xen.h
-===================================================================
---- head-2008-12-01.orig/include/xen/interface/xen.h 2008-12-01 11:22:59.000000000 +0100
-+++ head-2008-12-01/include/xen/interface/xen.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/interface/xen.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/include/xen/interface/xen.h 2009-05-14 11:17:48.000000000 +0200
@@ -32,7 +32,9 @@
#include <asm/pvclock-abi.h>
#endif
+#if __XEN_INTERFACE_VERSION__ < 0x00030101 || (defined(CONFIG_PARAVIRT_XEN) && !defined(HAVE_XEN_PLATFORM_COMPAT_H))
#undef __HYPERVISOR_sched_op
#define __HYPERVISOR_sched_op __HYPERVISOR_sched_op_compat
- #endif
-@@ -124,7 +126,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
+ #else
+@@ -126,7 +128,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
#endif
/* New platform_op hypercall introduced in 0x00030204. */
#define __HYPERVISOR_dom0_op __HYPERVISOR_platform_op
#endif
-@@ -283,6 +285,7 @@ struct mmuext_op {
+@@ -285,6 +287,7 @@ struct mmuext_op {
xen_pfn_t src_mfn;
} arg2;
};
typedef struct mmuext_op mmuext_op_t;
DEFINE_XEN_GUEST_HANDLE(mmuext_op_t);
#endif
-@@ -365,6 +368,7 @@ struct mmu_update {
+@@ -367,6 +370,7 @@ struct mmu_update {
uint64_t ptr; /* Machine address of PTE. */
uint64_t val; /* New contents of PTE. */
};
typedef struct mmu_update mmu_update_t;
DEFINE_XEN_GUEST_HANDLE(mmu_update_t);
-@@ -373,9 +377,15 @@ DEFINE_XEN_GUEST_HANDLE(mmu_update_t);
+@@ -375,9 +379,15 @@ DEFINE_XEN_GUEST_HANDLE(mmu_update_t);
* NB. The fields are natural register size for this architecture.
*/
struct multicall_entry {
typedef struct multicall_entry multicall_entry_t;
DEFINE_XEN_GUEST_HANDLE(multicall_entry_t);
-Index: head-2008-12-01/include/xen/xenbus.h
-===================================================================
---- head-2008-12-01.orig/include/xen/xenbus.h 2008-12-01 11:36:07.000000000 +0100
-+++ head-2008-12-01/include/xen/xenbus.h 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/include/xen/xenbus.h 2009-03-04 11:25:55.000000000 +0100
++++ sle11-2009-05-14/include/xen/xenbus.h 2009-02-16 16:17:21.000000000 +0100
@@ -57,16 +57,20 @@ struct xenbus_watch
void (*callback)(struct xenbus_watch *,
const char **vec, unsigned int len);
/**
* Advertise in the store a change of the given driver to the given new_state.
-Index: head-2008-12-01/net/core/dev.c
-===================================================================
---- head-2008-12-01.orig/net/core/dev.c 2008-12-01 11:36:13.000000000 +0100
-+++ head-2008-12-01/net/core/dev.c 2008-12-01 11:36:47.000000000 +0100
+--- sle11-2009-05-14.orig/net/core/dev.c 2008-12-15 11:27:22.000000000 +0100
++++ sle11-2009-05-14/net/core/dev.c 2009-02-16 16:17:21.000000000 +0100
@@ -131,7 +131,7 @@
#include "net-sysfs.h"
projects / people / pmueller / ipfire-2.x.git / blobdiff