Subject: xen3 x86 build fixes.
From: jbeulich@novell.com
Patch-mainline: obsolete

diff -r bf5ec328ccc5 arch/x86/power/Makefile
--- a/arch/x86/power/Makefile	Wed Sep 02 15:17:16 2009 -0500
+++ b/arch/x86/power/Makefile	Wed Sep 02 15:17:27 2009 -0500
@@ -5,3 +5,5 @@
 
 obj-$(CONFIG_PM_SLEEP)		+= cpu.o
 obj-$(CONFIG_HIBERNATION)	+= hibernate_$(BITS).o hibernate_asm_$(BITS).o
+
+disabled-obj-$(CONFIG_XEN)	:= cpu.o
diff -r bf5ec328ccc5 arch/x86/power/cpu.c
--- a/arch/x86/power/cpu.c	Wed Sep 02 15:17:16 2009 -0500
+++ b/arch/x86/power/cpu.c	Wed Sep 02 15:17:27 2009 -0500
@@ -125,7 +125,6 @@
 
 static void fix_processor_context(void)
 {
-#ifndef CONFIG_X86_NO_TSS
 	int cpu = smp_processor_id();
 	struct tss_struct *t = &per_cpu(init_tss, cpu);
 
@@ -138,10 +137,7 @@
 
 #ifdef CONFIG_X86_64
 	get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
-#endif
-#endif
 
-#ifdef CONFIG_X86_64
 	syscall_init();				/* This sets MSR_*STAR and related */
 #endif
 	load_TR_desc();				/* This does ltr */
