x86: cpu architecture debug code, build fix, cleanup

move store_ldt outside the CONFIG_PARAVIRT section and
also clean up the code a bit.

Signed-off-by: Jaswinder Singh Rajput <jaswinder@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/kernel/cpu/cpu_debug.c b/arch/x86/kernel/cpu/cpu_debug.c
index 0bdf4daba205..9abbcbd933cc 100755
--- a/arch/x86/kernel/cpu/cpu_debug.c
+++ b/arch/x86/kernel/cpu/cpu_debug.c
@@ -23,6 +23,7 @@
 #include <linux/smp.h>
 
 #include <asm/cpu_debug.h>
+#include <asm/paravirt.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/apic.h>
@@ -427,7 +428,7 @@ static void print_tss(void *arg)
         seq_printf(seq, " CS\t:             %04x\n", seg);
         asm("movl %%ds,%0" : "=r" (seg));
         seq_printf(seq, " DS\t:             %04x\n", seg);
-        seq_printf(seq, " SS\t:             %04lx\n", regs->ss);
+        seq_printf(seq, " SS\t:             %04lx\n", regs->ss & 0xffff);
         asm("movl %%es,%0" : "=r" (seg));
         seq_printf(seq, " ES\t:             %04x\n", seg);
         asm("movl %%fs,%0" : "=r" (seg));