[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <49B8F3A2.76E4.0078.0@novell.com>
Date: Thu, 12 Mar 2009 10:36:02 +0000
From: "Jan Beulich" <jbeulich@...ell.com>
To: <mingo@...e.hu>, <tglx@...utronix.de>, <hpa@...or.com>
Cc: "Andi Kleen" <andi@...stfloor.org>, <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86-64: add unwind annotations to early_idt_handler
Signed-off-by: Jan Beulich <jbeulich@...ell.com>
Cc: Andi Kleen <andi@...stfloor.org>
---
arch/x86/kernel/head_64.S | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- linux-2.6.29-rc7/arch/x86/kernel/head_64.S 2009-03-11 17:52:10.000000000 +0100
+++ 2.6.29-rc7-x86_64-unwind-early_idt_handler/arch/x86/kernel/head_64.S 2009-02-18 13:38:09.000000000 +0100
@@ -280,6 +280,8 @@ early_idt_handlers:
ENTRY(early_idt_handler)
#ifdef CONFIG_EARLY_PRINTK
+#include <asm/calling.h>
+#include <asm/dwarf2.h>
cmpl $2,early_recursion_flag(%rip)
jz 1f
incl early_recursion_flag(%rip)
@@ -295,6 +297,16 @@ ENTRY(early_idt_handler)
testl $0x27d00,%eax
je 0f
popq %r8 # get error code
+
+ CFI_STARTPROC simple
+ CFI_SIGNAL_FRAME
+ CFI_DEF_CFA rsp, SS+8-RIP
+# CFI_REL_OFFSET ss, SS-RIP
+ CFI_REL_OFFSET rsp, RSP-RIP
+# CFI_REL_OFFSET rflags, EFLAGS-RIP
+# CFI_REL_OFFSET cs, CS-RIP
+ CFI_REL_OFFSET rip, RIP-RIP
+
0: movq 0(%rsp),%rcx # get ip
movq 8(%rsp),%rdx # get cs
xorl %eax,%eax
@@ -308,6 +320,7 @@ ENTRY(early_idt_handler)
movq 0(%rsp),%rsi # get rip again
call __print_symbol
#endif
+ CFI_ENDPROC
#endif /* EARLY_PRINTK */
1: hlt
jmp 1b
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists