Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37550907 authored by Jan Beulich's avatar Jan Beulich Committed by Andi Kleen
Browse files

[PATCH] x86-64: a few missing entry.S annotations 



Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 0adad171

arch/x86_64/kernel/entry.S

+5 −0
Original line number Diff line number Diff line
@@ -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)