src/patches/suse-2.6.27.25/patches.xen/xen3-fixup-arch-x86

   1 Subject: xen3 x86 build fixes.
   2 From: jbeulich@novell.com
   3 Patch-mainline: obsolete
   4
   5 --- sle11-2009-06-04.orig/arch/x86/kdb/kdba_bt.c        2009-06-04 10:17:50.000000000 +0200
   6 +++ sle11-2009-06-04/arch/x86/kdb/kdba_bt.c     2009-06-04 10:19:52.000000000 +0200
   7 @@ -3196,6 +3196,9 @@ bb_usage_mov(const struct bb_operand *sr
   8             bb_is_int_reg(dst->base_rc) &&
   9             full_register_dst) {
  10  #ifdef CONFIG_X86_32
  11 +#ifndef TSS_sysenter_sp0
  12 +#define TSS_sysenter_sp0 SYSENTER_stack_sp0
  13 +#endif
  14                 /* mov from TSS_sysenter_sp0+offset to esp to fix up the
  15                  * sysenter stack, it leaves esp well defined.  mov
  16                  * TSS_ysenter_sp0+offset(%esp),%esp is followed by up to 5
  17 --- sle11-2009-06-04.orig/arch/x86/power/Makefile       2009-06-04 10:17:50.000000000 +0200
  18 +++ sle11-2009-06-04/arch/x86/power/Makefile    2009-06-04 10:19:52.000000000 +0200
  19 @@ -1,2 +1,4 @@
  20  obj-$(CONFIG_PM_SLEEP)         += cpu_$(BITS).o
  21  obj-$(CONFIG_HIBERNATION)      += hibernate_$(BITS).o hibernate_asm_$(BITS).o
  22 +
  23 +disabled-obj-$(CONFIG_XEN)     := cpu_$(BITS).o
  24 --- sle11-2009-06-04.orig/arch/x86/power/cpu_64.c       2009-06-04 10:18:37.000000000 +0200
  25 +++ sle11-2009-06-04/arch/x86/power/cpu_64.c    2009-06-04 10:19:52.000000000 +0200
  26 @@ -135,7 +135,6 @@ void restore_processor_state(void)
  27
  28  static void fix_processor_context(void)
  29  {
  30 -#ifndef CONFIG_X86_NO_TSS
  31         int cpu = smp_processor_id();
  32         struct tss_struct *t = &per_cpu(init_tss, cpu);
  33
  34 @@ -147,7 +146,6 @@ static void fix_processor_context(void)
  35         set_tss_desc(cpu, t);
  36
  37         get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
  38 -#endif
  39
  40         syscall_init();                         /* This sets MSR_*STAR and related */
  41         load_TR_desc();                         /* This does ltr */