Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753396AbcD1KrS (ORCPT ); Thu, 28 Apr 2016 06:47:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48508 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752049AbcD1KrO (ORCPT ); Thu, 28 Apr 2016 06:47:14 -0400 Date: Thu, 28 Apr 2016 03:46:09 -0700 From: tip-bot for Mark Rutland Message-ID: Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, bp@alien8.de, ard.biesheuvel@linaro.org, mark.rutland@arm.com, leif.lindholm@linaro.org, linux@arm.linux.org.uk, hpa@zytor.com, matt@codeblueprint.co.uk, catalin.marinas@arm.com, tglx@linutronix.de, mingo@kernel.org, will.deacon@arm.com Reply-To: tglx@linutronix.de, mingo@kernel.org, will.deacon@arm.com, catalin.marinas@arm.com, matt@codeblueprint.co.uk, peterz@infradead.org, bp@alien8.de, ard.biesheuvel@linaro.org, mark.rutland@arm.com, hpa@zytor.com, leif.lindholm@linaro.org, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org In-Reply-To: <1461614832-17633-41-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-41-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK #ifdef Git-Commit-ID: 0cf0223c8370af0fcedb15a408d3c17bb4b9e21d 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 Content-Length: 2156 Lines: 55 Commit-ID: 0cf0223c8370af0fcedb15a408d3c17bb4b9e21d Gitweb: http://git.kernel.org/tip/0cf0223c8370af0fcedb15a408d3c17bb4b9e21d Author: Mark Rutland AuthorDate: Mon, 25 Apr 2016 21:07:12 +0100 Committer: Ingo Molnar CommitDate: Thu, 28 Apr 2016 11:34:13 +0200 efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK #ifdef Now that arm, arm64, and x86 all provide ARCH_EFI_IRQ_FLAGS_MASK, we can get rid of the trivial and now unused implementation of efi_call_virt_check_flags(). Signed-off-by: Mark Rutland Signed-off-by: Matt Fleming Cc: Ard Biesheuvel Cc: Borislav Petkov Cc: Catalin Marinas Cc: Leif Lindholm Cc: Peter Zijlstra Cc: Russell King Cc: Thomas Gleixner Cc: Will Deacon Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-41-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- drivers/firmware/efi/runtime-wrappers.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 89dcdb3..23bef6b 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -22,10 +22,6 @@ #include #include -/* - * Temporary scaffolding until all users provide ARCH_EFI_IRQ_FLAGS_MASK. - */ -#ifdef ARCH_EFI_IRQ_FLAGS_MASK static void efi_call_virt_check_flags(unsigned long flags, const char *call) { unsigned long cur_flags, mismatch; @@ -41,9 +37,6 @@ static void efi_call_virt_check_flags(unsigned long flags, const char *call) flags, cur_flags, call); local_irq_restore(flags); } -#else /* ARCH_EFI_IRQ_FLAGS_MASK */ -static inline void efi_call_virt_check_flags(unsigned long flags, const char *call) {} -#endif /* ARCH_EFI_IRQ_FLAGS_MASK */ /* * Arch code can implement the following three template macros, avoiding