src/patches/60025_xen3-fixup-arch-x86.patch1

   1 Subject: xen3 x86 build fixes.
   2 From: jbeulich@novell.com
   3 Patch-mainline: obsolete
   4
   5 Index: head-2008-11-25/arch/x86/kernel/crash.c
   6 ===================================================================
   7 --- head-2008-11-25.orig/arch/x86/kernel/crash.c        2008-11-25 14:34:12.000000000 +0100
   8 +++ head-2008-11-25/arch/x86/kernel/crash.c     2008-11-25 12:41:33.000000000 +0100
   9 @@ -29,10 +29,10 @@
  10
  11  #include <mach_ipi.h>
  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 @@ -206,9 +206,9 @@ void native_machine_crash_shutdown(struc
  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-11-25/arch/x86/power/Makefile
  33 ===================================================================
  34 --- head-2008-11-25.orig/arch/x86/power/Makefile        2008-11-25 14:34:12.000000000 +0100
  35 +++ head-2008-11-25/arch/x86/power/Makefile     2008-11-25 12:41:33.000000000 +0100
  36 @@ -1,2 +1,4 @@
  37  obj-$(CONFIG_PM_SLEEP)         += cpu_$(BITS).o
  38  obj-$(CONFIG_HIBERNATION)      += hibernate_$(BITS).o hibernate_asm_$(BITS).o
  39 +
  40 +disabled-obj-$(CONFIG_XEN)     := cpu_$(BITS).o
  41 Index: head-2008-11-25/arch/x86/power/cpu_64.c
  42 ===================================================================
  43 --- head-2008-11-25.orig/arch/x86/power/cpu_64.c        2008-11-25 14:34:12.000000000 +0100
  44 +++ head-2008-11-25/arch/x86/power/cpu_64.c     2008-11-25 12:41:33.000000000 +0100
  45 @@ -135,7 +135,6 @@ void restore_processor_state(void)
  46
  47  static void fix_processor_context(void)
  48  {
  49 -#ifndef CONFIG_X86_NO_TSS
  50         int cpu = smp_processor_id();
  51         struct tss_struct *t = &per_cpu(init_tss, cpu);
  52
  53 @@ -147,7 +146,6 @@ static void fix_processor_context(void)
  54         set_tss_desc(cpu, t);
  55
  56         get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
  57 -#endif
  58
  59         syscall_init();                         /* This sets MSR_*STAR and related */
  60         load_TR_desc();                         /* This does ltr */