Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1018-2.6.25-xen-fixup-arch-x86.patch
Parent Directory
| 
Revision Log
Revision 609 -
(show annotations)
(download)
Fri May 23 17:35:37 2008 UTC (15 years, 11 months ago) by niro
File size: 2750 byte(s)
Fri May 23 17:35:37 2008 UTC (15 years, 11 months ago) by niro
File size: 2750 byte(s)
-using opensuse xen patchset, updated kernel configs
| 1 | Subject: xen3 x86 build fixes. |
| 2 | From: jbeulich@novell.com |
| 3 | Patch-mainline: obsolete |
| 4 | |
| 5 | Index: head-2008-04-02/arch/x86/kernel/crash.c |
| 6 | =================================================================== |
| 7 | --- head-2008-04-02.orig/arch/x86/kernel/crash.c 2008-04-02 14:51:51.000000000 +0200 |
| 8 | +++ head-2008-04-02/arch/x86/kernel/crash.c 2008-03-11 14:40:45.000000000 +0100 |
| 9 | @@ -32,10 +32,10 @@ |
| 10 | #include <asm/mach_apic.h> |
| 11 | #endif |
| 12 | |
| 13 | +#ifndef CONFIG_XEN |
| 14 | /* This keeps a track of which one is crashing cpu. */ |
| 15 | static int crashing_cpu; |
| 16 | |
| 17 | -#ifndef CONFIG_XEN |
| 18 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) |
| 19 | static atomic_t waiting_for_crash_ipi; |
| 20 | |
| 21 | @@ -136,9 +136,9 @@ void machine_crash_shutdown(struct pt_re |
| 22 | /* The kernel is broken so disable interrupts */ |
| 23 | local_irq_disable(); |
| 24 | |
| 25 | +#ifndef CONFIG_XEN |
| 26 | /* Make a note of crashing cpu. Will be used in NMI callback.*/ |
| 27 | crashing_cpu = safe_smp_processor_id(); |
| 28 | -#ifndef CONFIG_XEN |
| 29 | nmi_shootdown_cpus(); |
| 30 | lapic_shutdown(); |
| 31 | #if defined(CONFIG_X86_IO_APIC) |
| 32 | Index: head-2008-04-02/arch/x86/kernel/pci-swiotlb_64-xen.c |
| 33 | =================================================================== |
| 34 | --- head-2008-04-02.orig/arch/x86/kernel/pci-swiotlb_64-xen.c 2008-04-02 14:51:51.000000000 +0200 |
| 35 | +++ head-2008-04-02/arch/x86/kernel/pci-swiotlb_64-xen.c 2008-03-11 14:40:45.000000000 +0100 |
| 36 | @@ -13,6 +13,8 @@ int swiotlb __read_mostly; |
| 37 | EXPORT_SYMBOL(swiotlb); |
| 38 | #endif |
| 39 | |
| 40 | +void swiotlb_init(void); |
| 41 | + |
| 42 | struct dma_mapping_ops swiotlb_dma_ops = { |
| 43 | #if 0 |
| 44 | .mapping_error = swiotlb_dma_mapping_error, |
| 45 | Index: head-2008-04-02/arch/x86/power/Makefile |
| 46 | =================================================================== |
| 47 | --- head-2008-04-02.orig/arch/x86/power/Makefile 2008-04-02 14:51:51.000000000 +0200 |
| 48 | +++ head-2008-04-02/arch/x86/power/Makefile 2008-03-11 14:40:45.000000000 +0100 |
| 49 | @@ -1,2 +1,4 @@ |
| 50 | obj-$(CONFIG_PM_SLEEP) += cpu_$(BITS).o |
| 51 | obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o |
| 52 | + |
| 53 | +disabled-obj-$(CONFIG_XEN) := cpu_$(BITS).o |
| 54 | Index: head-2008-04-02/arch/x86/power/cpu_64.c |
| 55 | =================================================================== |
| 56 | --- head-2008-04-02.orig/arch/x86/power/cpu_64.c 2008-04-02 12:47:59.000000000 +0200 |
| 57 | +++ head-2008-04-02/arch/x86/power/cpu_64.c 2008-03-11 14:40:45.000000000 +0100 |
| 58 | @@ -135,7 +135,6 @@ void restore_processor_state(void) |
| 59 | |
| 60 | static void fix_processor_context(void) |
| 61 | { |
| 62 | -#ifndef CONFIG_X86_NO_TSS |
| 63 | int cpu = smp_processor_id(); |
| 64 | struct tss_struct *t = &per_cpu(init_tss, cpu); |
| 65 | |
| 66 | @@ -147,7 +146,6 @@ static void fix_processor_context(void) |
| 67 | set_tss_desc(cpu, t); |
| 68 | |
| 69 | get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9; |
| 70 | -#endif |
| 71 | |
| 72 | syscall_init(); /* This sets MSR_*STAR and related */ |
| 73 | load_TR_desc(); /* This does ltr */ |