summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-02-03 18:52:16 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-03 18:52:16 -0800
commit839401aa88046106da64808ea5f2186d8204a7aa (patch)
tree7a6904f606f564a6cc452f9beb02882bdd4aabfe
parent8d849f5b2e1cb3db841bcc08342dac7f2997fb9d (diff)
[PATCH] Fix x86-64 boot problem
From: Andi Kleen <ak@muc.de> Fix a bug introduced with the last merge that prevented booting with CONFIG_DEBUG_INFO on on x86-64. It would corrupt registers in interrupts. This has hit a few people, so I would consider it as a critical fix.
-rw-r--r--arch/x86_64/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index b1e491b2a2c5..3acb6da4b4ce 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -436,7 +436,7 @@ ret_from_intr:
popq %rdi
cli
subl $1,%gs:pda_irqcount
-#ifdef CONFIG_KGDB
+#ifdef CONFIG_DEBUG_INFO
movq RBP(%rdi),%rbp
#endif
leaq ARGOFFSET(%rdi),%rsp