[PATCH] [18/35] x86_64: a few missing entry.S annotations

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Andi Kleen
Date: Saturday, April 28, 2007 - 10:52 am

From: "Jan Beulich" <jbeulich@novell.com>
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>

---
 arch/x86_64/kernel/entry.S |    5 +++++
 1 file changed, 5 insertions(+)

Index: linux/arch/x86_64/kernel/entry.S
===================================================================
--- linux.orig/arch/x86_64/kernel/entry.S
+++ linux/arch/x86_64/kernel/entry.S
@@ -701,6 +701,7 @@ END(spurious_interrupt)
 	CFI_ADJUST_CFA_OFFSET 8
 	pushq %rax	/* push real oldrax to the rdi slot */ 
 	CFI_ADJUST_CFA_OFFSET 8
+	CFI_REL_OFFSET rax,0
 	leaq  \sym(%rip),%rax
 	jmp error_entry
 	CFI_ENDPROC
@@ -710,6 +711,7 @@ END(spurious_interrupt)
 	XCPT_FRAME
 	pushq %rax
 	CFI_ADJUST_CFA_OFFSET 8
+	CFI_REL_OFFSET rax,0
 	leaq  \sym(%rip),%rax
 	jmp error_entry
 	CFI_ENDPROC
@@ -817,6 +819,7 @@ paranoid_schedule\trace:
  */ 		  				
 KPROBE_ENTRY(error_entry)
 	_frame RDI
+	CFI_REL_OFFSET rax,0
 	/* rdi slot contains rax, oldrax contains error code */
 	cld	
 	subq  $14*8,%rsp
@@ -824,6 +827,7 @@ KPROBE_ENTRY(error_entry)
 	movq %rsi,13*8(%rsp)
 	CFI_REL_OFFSET	rsi,RSI
 	movq 14*8(%rsp),%rsi	/* load rax from rdi slot */
+	CFI_REGISTER	rax,rsi
 	movq %rdx,12*8(%rsp)
 	CFI_REL_OFFSET	rdx,RDX
 	movq %rcx,11*8(%rsp)
@@ -857,6 +861,7 @@ error_swapgs:	
 	swapgs
 error_sti:	
 	movq %rdi,RDI(%rsp) 	
+	CFI_REL_OFFSET	rdi,RDI
 	movq %rsp,%rdi
 	movq ORIG_RAX(%rsp),%rsi	/* get error code */ 
 	movq $-1,ORIG_RAX(%rsp)
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] [6/35] x86_64: remove clustered APIC mode, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [10/35] x86: adjust inclusion of asm/fixmap.h, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [12/35] x86: consolidate smp_send_stop(), Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [14/35] i386: mtrr range check correction, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [15/35] i386: pit_latch_buggy has no effect, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [17/35] i386: probe_roms() cleanup, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [18/35] x86_64: a few missing entry.S annotations, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [21/35] x86_64: Some cleanup in time.c, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [24/35] i386: Add __init to probe_bigsmp, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [30/35] i386: clean up mach_reboot_fixups, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [32/35] x86_64: Remove unused set_seg_base, Andi Kleen, (Sat Apr 28, 10:52 am)