From c7a878dcf9d0ec9caf8aa09d6953fd57e616625a Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Wed, 11 Feb 2009 18:46:32 -0600
Subject: [PATCH] --- yaml --- r: 144999 b: refs/heads/master c:
 33ab1979bc9f719213bc3f392c8fd9d012e4f4e9 h: refs/heads/master i:   144997:
 bdd0f23fb945846592c6f25cc00e777c9439d309   144995:
 123c8616780328f4be6d0e2f6acf1afa15b19777   144991:
 b7402035ca77d73e2e369742d06f498231ea75a2 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/kgdb.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 860b7d28cdcf..6b6d6e710e1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 364b5b7b1d793a7f98be55b6b154716dcae78dfc
+refs/heads/master: 33ab1979bc9f719213bc3f392c8fd9d012e4f4e9
diff --git a/trunk/arch/x86/kernel/kgdb.c b/trunk/arch/x86/kernel/kgdb.c
index eedfaebe1063..b1f4dffb919e 100644
--- a/trunk/arch/x86/kernel/kgdb.c
+++ b/trunk/arch/x86/kernel/kgdb.c
@@ -88,6 +88,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 	gdb_regs[GDB_SS]	= __KERNEL_DS;
 	gdb_regs[GDB_FS]	= 0xFFFF;
 	gdb_regs[GDB_GS]	= 0xFFFF;
+	gdb_regs[GDB_SP]	= (int)&regs->sp;
 #else
 	gdb_regs[GDB_R8]	= regs->r8;
 	gdb_regs[GDB_R9]	= regs->r9;
@@ -100,8 +101,8 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 	gdb_regs32[GDB_PS]	= regs->flags;
 	gdb_regs32[GDB_CS]	= regs->cs;
 	gdb_regs32[GDB_SS]	= regs->ss;
-#endif
 	gdb_regs[GDB_SP]	= regs->sp;
+#endif
 }
 
 /**