- Update Xen patches to 3.4-rc3 and c/s 1172.

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / kernel / dumpstack_64.c

diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index caf5de0..d9b4f99 100644 (file)
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -21,6 +21,7 @@
 #define N_EXCEPTION_STACKS_END \
                (N_EXCEPTION_STACKS + DEBUG_STKSZ/EXCEPTION_STKSZ - 2)
 
+#ifndef CONFIG_X86_NO_TSS
 static char x86_stack_ids[][8] = {
                [ DEBUG_STACK-1                 ]       = "#DB",
                [ NMI_STACK-1                   ]       = "NMI",
@@ -32,10 +33,12 @@ static char x86_stack_ids[][8] = {
                  N_EXCEPTION_STACKS_END        ]       = "#DB[?]"
 #endif
 };
+#endif
 
 static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
                                         unsigned *usedp, char **idp)
 {
+#ifndef CONFIG_X86_NO_TSS
        unsigned k;
 
        /*
@@ -95,6 +98,7 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
                }
 #endif
        }
+#endif /* CONFIG_X86_NO_TSS */
        return NULL;
 }