Xen devel - Mar 2007 - [PATCH 8/10] linux/x86_64 2.6.18: remove orig_ist

orig_ist is bound to presence of a TSS, hence is meaningless on Xen kernels.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: head-2007-02-27/arch/x86_64/kernel/init_task.c
==================================================================---
head-2007-02-27.orig/arch/x86_64/kernel/init_task.c	2007-03-05
10:00:18.000000000 +0100
+++ head-2007-02-27/arch/x86_64/kernel/init_task.c	2007-02-27 16:27:37.000000000
+0100
@@ -47,11 +47,11 @@ EXPORT_SYMBOL(init_task);
  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
  */ 
 DEFINE_PER_CPU(struct tss_struct, init_tss)
____cacheline_internodealigned_in_smp = INIT_TSS;
-#endif
 
 /* Copies of the original ist values from the tss are only accessed during
  * debugging, no special alignment required.
  */
 DEFINE_PER_CPU(struct orig_ist, orig_ist);
+#endif
 
 #define ALIGN_TO_4K __attribute__((section(".data.init_task")))
Index: head-2007-02-27/include/asm-x86_64/mach-xen/asm/processor.h
==================================================================---
head-2007-02-27.orig/include/asm-x86_64/mach-xen/asm/processor.h	2007-03-05
10:00:18.000000000 +0100
+++ head-2007-02-27/include/asm-x86_64/mach-xen/asm/processor.h	2007-02-27
16:27:37.000000000 +0100
@@ -246,11 +246,13 @@ DECLARE_PER_CPU(struct tss_struct,init_t
 
 
 extern struct cpuinfo_x86 boot_cpu_data;
+#ifndef CONFIG_X86_NO_TSS
 /* Save the original ist values for checking stack pointers during debugging */
 struct orig_ist {
 	unsigned long ist[7];
 };
 DECLARE_PER_CPU(struct orig_ist, orig_ist);
+#endif
 
 #ifdef CONFIG_X86_VSMP
 #define ARCH_MIN_TASKALIGN	(1 << INTERNODE_CACHE_SHIFT)



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel