Commit 3aa99fc3 authored Feb 20, 2018 by Dominik Brodowski Committed by Ingo Molnar Feb 21, 2018

x86/entry/64: Remove 'interrupt' macro

It is now trivial to call interrupt_entry() and then the actual worker.
Therefore, remove the interrupt macro and open code it all.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: dan.j.williams@intel.com
Link: http://lkml.kernel.org/r/20180220210113.6725-5-linux@dominikbrodowski.net

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 90a6acc4

arch/x86/entry/entry_64.S

+6 −10

Original line number	Diff line number	Diff line
		@@ -608,14 +608,6 @@ ENTRY(interrupt_entry)
		ret
		END(interrupt_entry)

		/* 0(%rsp): ~(interrupt number) */
		.macro interrupt func
		call interrupt_entry

		UNWIND_HINT_REGS indirect=1
		call \func /* rdi points to pt_regs */
		.endm

		/*
		* The interrupt stubs push (~vector+0x80) onto the stack and
		* then jump to common_interrupt.
		@@ -624,7 +616,9 @@ END(interrupt_entry)
		common_interrupt:
		ASM_CLAC
		addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */
		interrupt do_IRQ
		call interrupt_entry
		UNWIND_HINT_REGS indirect=1
		call do_IRQ /* rdi points to pt_regs */
		/* 0(%rsp): old RSP */
		ret_from_intr:
		DISABLE_INTERRUPTS(CLBR_ANY)
		@@ -820,7 +814,9 @@ ENTRY(\sym)
		ASM_CLAC
		pushq $~(\num)
		.Lcommon_\sym:
		interrupt \do_sym
		call interrupt_entry
		UNWIND_HINT_REGS indirect=1
		call \do_sym /* rdi points to pt_regs */
		jmp ret_from_intr
		END(\sym)
		.endm