From e51ebeebe54d8212ab2492dd10aa51a4974f8f35 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinder@kernel.org>
Date: Wed, 11 Mar 2009 19:13:49 +0530
Subject: [PATCH] --- yaml --- r: 138711 b: refs/heads/master c:
 8229d754383e8cd905c38b56bd7365c7fc10dfc1 h: refs/heads/master i:   138709:
 7342fc73600951492c53927ec089dad8af9a0801   138707:
 f1f6a8132496eaf9f6fa2bba1d2e0964dfa9e1e3   138703:
 9830f8c7fae3b84aff2e0922418850a6a26cf031 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/include/asm/desc.h     | 3 ++-
 trunk/arch/x86/kernel/cpu/cpu_debug.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9dd558d3deeb..cbc68468b455 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b779edf4b97798d037bb44fca2719ac184d0f14
+refs/heads/master: 8229d754383e8cd905c38b56bd7365c7fc10dfc1
diff --git a/trunk/arch/x86/include/asm/desc.h b/trunk/arch/x86/include/asm/desc.h
index dc27705f5443..5623c50d67b2 100644
--- a/trunk/arch/x86/include/asm/desc.h
+++ b/trunk/arch/x86/include/asm/desc.h
@@ -91,7 +91,6 @@ static inline int desc_empty(const void *ptr)
 #define store_gdt(dtr) native_store_gdt(dtr)
 #define store_idt(dtr) native_store_idt(dtr)
 #define store_tr(tr) (tr = native_store_tr())
-#define store_ldt(ldt) asm("sldt %0":"=m" (ldt))
 
 #define load_TLS(t, cpu) native_load_tls(t, cpu)
 #define set_ldt native_set_ldt
@@ -112,6 +111,8 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
 }
 #endif	/* CONFIG_PARAVIRT */
 
+#define store_ldt(ldt) asm("sldt %0" : "=m"(ldt))
+
 static inline void native_write_idt_entry(gate_desc *idt, int entry,
 					  const gate_desc *gate)
 {
diff --git a/trunk/arch/x86/kernel/cpu/cpu_debug.c b/trunk/arch/x86/kernel/cpu/cpu_debug.c
index 0bdf4daba205..9abbcbd933cc 100755
--- a/trunk/arch/x86/kernel/cpu/cpu_debug.c
+++ b/trunk/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));