From: Andrew Morton <akpm@osdl.org>

arch/x86_64/kernel/entry.S: Assembler messages:
arch/x86_64/kernel/entry.S:1060: Error: previous CFI entry not closed (missing .cfi_endproc)
arch/x86_64/kernel/entry.S:1060: Error: no such instruction: `simple'

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/kernel/entry.S |    1 +
 1 file changed, 1 insertion(+)

diff -puN arch/x86_64/kernel/entry.S~lockdep-irqtrace-subsystem-x86_64-support-fix arch/x86_64/kernel/entry.S
--- a/arch/x86_64/kernel/entry.S~lockdep-irqtrace-subsystem-x86_64-support-fix
+++ a/arch/x86_64/kernel/entry.S
@@ -1052,6 +1052,7 @@ KPROBE_ENTRY(nmi)
 	paranoidexit 0
 #else
 	jmp paranoid_exit1
+ 	CFI_ENDPROC
 #endif
 END(nmi)
 	.previous .text
_