From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161862AbeBNSWf (ORCPT ); Wed, 14 Feb 2018 13:22:35 -0500 Received: from isilmar-4.linta.de ([136.243.71.142]:48076 "EHLO isilmar-4.linta.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161692AbeBNSWe (ORCPT ); Wed, 14 Feb 2018 13:22:34 -0500 From: Dominik Brodowski To: linux-kernel@vger.kernel.org, mingo@kernel.org, x86@kernel.org Cc: torvalds@linux-foundation.org, luto@kernel.org, ak@linux.intel.com, tglx@linutronix.de, dan.j.williams@intel.com Subject: [RFC PATCH 4/4] x86/entry/64: remove interrupt macro Date: Wed, 14 Feb 2018 19:21:13 +0100 Message-Id: <20180214182113.27247-5-linux@dominikbrodowski.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180214182113.27247-1-linux@dominikbrodowski.net> References: <20180214182113.27247-1-linux@dominikbrodowski.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is now trivial to call the interrupt helper function and then the actual worker. Therefore, remove the interrupt macro. Suggested-by: Linus Torvalds Signed-off-by: Dominik Brodowski --- arch/x86/entry/entry_64.S | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index b60a3b692ca9..09205da68764 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -607,15 +607,6 @@ ENTRY(interrupt_helper) ret END(interrupt_helper) -/* 0(%rsp): ~(interrupt number) */ - .macro interrupt func - cld - - call interrupt_helper - - 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 +615,8 @@ END(interrupt_helper) common_interrupt: ASM_CLAC addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */ - interrupt do_IRQ + call interrupt_helper + call do_IRQ /* rdi points to pt_regs */ /* 0(%rsp): old RSP */ ret_from_intr: DISABLE_INTERRUPTS(CLBR_ANY) @@ -816,7 +808,8 @@ ENTRY(\sym) ASM_CLAC pushq $~(\num) .Lcommon_\sym: - interrupt \do_sym + call interrupt_helper + call \do_sym /* rdi points to pt_regs */ jmp ret_from_intr END(\sym) .endm -- 2.16.1