Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753433AbcD1KpQ (ORCPT ); Thu, 28 Apr 2016 06:45:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48354 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752940AbcD1KpN (ORCPT ); Thu, 28 Apr 2016 06:45:13 -0400 Date: Thu, 28 Apr 2016 03:44:08 -0700 From: tip-bot for Mark Rutland Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mark.rutland@arm.com, peterz@infradead.org, will.deacon@arm.com, ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, matt@codeblueprint.co.uk, mingo@kernel.org, linux@arm.linux.org.uk, catalin.marinas@arm.com, bp@alien8.de Reply-To: hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mark.rutland@arm.com, peterz@infradead.org, will.deacon@arm.com, ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, matt@codeblueprint.co.uk, linux@arm.linux.org.uk, mingo@kernel.org, catalin.marinas@arm.com, bp@alien8.de In-Reply-To: <1461614832-17633-36-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-36-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/runtime-wrappers: Remove redundant #ifdefs Git-Commit-ID: d9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c 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: 2091 Lines: 61 Commit-ID: d9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c Gitweb: http://git.kernel.org/tip/d9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c Author: Mark Rutland AuthorDate: Mon, 25 Apr 2016 21:07:07 +0100 Committer: Ingo Molnar CommitDate: Thu, 28 Apr 2016 11:34:10 +0200 efi/runtime-wrappers: Remove redundant #ifdefs Now that all users of the EFI runtime wrappers (arm,arm64,x86) have been migrated to the new setup/teardown macros, we don't need to support overridden {__,}efi_call_virt() implementations. This patch removes the unnecessary #ifdefs. 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-36-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- drivers/firmware/efi/runtime-wrappers.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 0677577..b9ece37 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -40,7 +40,6 @@ * Restores the usual kernel environment once the call has returned. */ -#ifndef efi_call_virt #define efi_call_virt(f, args...) \ ({ \ efi_status_t __s; \ @@ -49,16 +48,13 @@ arch_efi_call_virt_teardown(); \ __s; \ }) -#endif -#ifndef __efi_call_virt #define __efi_call_virt(f, args...) \ ({ \ arch_efi_call_virt_setup(); \ arch_efi_call_virt(f, args); \ arch_efi_call_virt_teardown(); \ }) -#endif /* * According to section 7.1 of the UEFI spec, Runtime Services are not fully