From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753675AbeBUKrr (ORCPT ); Wed, 21 Feb 2018 05:47:47 -0500 Received: from terminus.zytor.com ([198.137.202.136]:49861 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752178AbeBUKrp (ORCPT ); Wed, 21 Feb 2018 05:47:45 -0500 Date: Wed, 21 Feb 2018 02:47:05 -0800 From: tip-bot for Dominik Brodowski Message-ID: Cc: linux-kernel@vger.kernel.org, linux@dominikbrodowski.net, mingo@kernel.org, dwmw2@infradead.org, jpoimboe@redhat.com, brgerst@gmail.com, hpa@zytor.com, bp@alien8.de, luto@kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, peterz@infradead.org Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, dvlasenk@redhat.com, peterz@infradead.org, brgerst@gmail.com, luto@kernel.org, bp@alien8.de, hpa@zytor.com, mingo@kernel.org, dwmw2@infradead.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, linux@dominikbrodowski.net In-Reply-To: <20180220210113.6725-5-linux@dominikbrodowski.net> References: <20180220210113.6725-5-linux@dominikbrodowski.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/entry/64: Remove 'interrupt' macro Git-Commit-ID: 9aaa78dee43a61febabddeab44ea9da90dd05ba8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9aaa78dee43a61febabddeab44ea9da90dd05ba8 Gitweb: https://git.kernel.org/tip/9aaa78dee43a61febabddeab44ea9da90dd05ba8 Author: Dominik Brodowski AuthorDate: Tue, 20 Feb 2018 22:01:11 +0100 Committer: Ingo Molnar CommitDate: Wed, 21 Feb 2018 10:04:47 +0100 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 Signed-off-by: Dominik Brodowski Acked-by: Thomas Gleixner Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: David Woodhouse Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Peter Zijlstra Cc: dan.j.williams@intel.com Link: http://lkml.kernel.org/r/20180220210113.6725-5-linux@dominikbrodowski.net Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index b45d766..8ea03cf 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -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