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

Commit c39858de authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/entry/64: Remove the RESTORE_..._REGS infrastructure 



All users of RESTORE_EXTRA_REGS, RESTORE_C_REGS and such, and
REMOVE_PT_GPREGS_FROM_STACK are gone.  Delete the macros.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/c32672f6e47c561893316d48e06c7656b1039a36.1509609304.git.luto@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 471ee483

arch/x86/entry/calling.h

+0 −52
Original line number Original line Diff line number Diff line
@@ -141,16 +141,6 @@ For 32-bit we have the following conventions - kernel is built with 
	UNWIND_HINT_REGS offset=\offset

	UNWIND_HINT_REGS offset=\offset

	.endm

	.endm





	.macro RESTORE_EXTRA_REGS offset=0

	movq 0*8+\offset(%rsp), %r15

	movq 1*8+\offset(%rsp), %r14

	movq 2*8+\offset(%rsp), %r13

	movq 3*8+\offset(%rsp), %r12

	movq 4*8+\offset(%rsp), %rbp

	movq 5*8+\offset(%rsp), %rbx

	UNWIND_HINT_REGS offset=\offset extra=0

	.endm



	.macro POP_EXTRA_REGS

	.macro POP_EXTRA_REGS

	popq %r15

	popq %r15

	popq %r14

	popq %r14
@@ -172,48 +162,6 @@ For 32-bit we have the following conventions - kernel is built with 
	popq %rdi

	popq %rdi

	.endm

	.endm





	.macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1

	.if \rstor_r11

	movq 6*8(%rsp), %r11

	.endif

	.if \rstor_r8910

	movq 7*8(%rsp), %r10

	movq 8*8(%rsp), %r9

	movq 9*8(%rsp), %r8

	.endif

	.if \rstor_rax

	movq 10*8(%rsp), %rax

	.endif

	.if \rstor_rcx

	movq 11*8(%rsp), %rcx

	.endif

	.if \rstor_rdx

	movq 12*8(%rsp), %rdx

	.endif

	movq 13*8(%rsp), %rsi

	movq 14*8(%rsp), %rdi

	UNWIND_HINT_IRET_REGS offset=16*8

	.endm

	.macro RESTORE_C_REGS

	RESTORE_C_REGS_HELPER 1,1,1,1,1

	.endm

	.macro RESTORE_C_REGS_EXCEPT_RAX

	RESTORE_C_REGS_HELPER 0,1,1,1,1

	.endm

	.macro RESTORE_C_REGS_EXCEPT_RCX

	RESTORE_C_REGS_HELPER 1,0,1,1,1

	.endm

	.macro RESTORE_C_REGS_EXCEPT_R11

	RESTORE_C_REGS_HELPER 1,1,0,1,1

	.endm

	.macro RESTORE_C_REGS_EXCEPT_RCX_R11

	RESTORE_C_REGS_HELPER 1,0,0,1,1

	.endm



	.macro REMOVE_PT_GPREGS_FROM_STACK addskip=0

	subq $-(15*8+\addskip), %rsp

	.endm



	.macro icebp

	.macro icebp

	.byte 0xf1

	.byte 0xf1

	.endm

	.endm