Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320AbcD1Ko2 (ORCPT ); Thu, 28 Apr 2016 06:44:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48262 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920AbcD1KoZ (ORCPT ); Thu, 28 Apr 2016 06:44:25 -0400 Date: Thu, 28 Apr 2016 03:43:20 -0700 From: tip-bot for Mark Rutland Message-ID: Cc: ard.biesheuvel@linaro.org, will.deacon@arm.com, hpa@zytor.com, colin.king@canonical.com, leif.lindholm@linaro.org, catalin.marinas@arm.com, linux@arm.linux.org.uk, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, matt@codeblueprint.co.uk, tglx@linutronix.de, mark.rutland@arm.com, bp@alien8.de Reply-To: will.deacon@arm.com, ard.biesheuvel@linaro.org, colin.king@canonical.com, leif.lindholm@linaro.org, hpa@zytor.com, peterz@infradead.org, linux@arm.linux.org.uk, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, tglx@linutronix.de, mingo@kernel.org, mark.rutland@arm.com, bp@alien8.de In-Reply-To: <1461614832-17633-34-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-34-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] arm/efi: Move to generic {__,}efi_call_virt() Git-Commit-ID: 819fc126edcb458f26e9a7fda54bfdd36dfbce06 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: 2369 Lines: 66 Commit-ID: 819fc126edcb458f26e9a7fda54bfdd36dfbce06 Gitweb: http://git.kernel.org/tip/819fc126edcb458f26e9a7fda54bfdd36dfbce06 Author: Mark Rutland AuthorDate: Mon, 25 Apr 2016 21:07:05 +0100 Committer: Ingo Molnar CommitDate: Thu, 28 Apr 2016 11:34:08 +0200 arm/efi: Move to generic {__,}efi_call_virt() Now there's a common template for {__,}efi_call_virt(), remove the duplicate logic from the ARM EFI code. Signed-off-by: Mark Rutland Signed-off-by: Matt Fleming Reviewed-by: Ard Biesheuvel Cc: Borislav Petkov Cc: Catalin Marinas Cc: Colin Ian King Cc: Leif Lindholm Cc: Peter Zijlstra Cc: Russell King Cc: Thomas Gleixner Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-34-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- arch/arm/include/asm/efi.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h index b45fe39..5f273b43 100644 --- a/arch/arm/include/asm/efi.h +++ b/arch/arm/include/asm/efi.h @@ -24,26 +24,14 @@ void efi_init(void); int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); -#define efi_call_virt(f, ...) \ -({ \ - efi_##f##_t *__f; \ - efi_status_t __s; \ - \ - efi_virtmap_load(); \ - __f = efi.systab->runtime->f; \ - __s = __f(__VA_ARGS__); \ - efi_virtmap_unload(); \ - __s; \ -}) +#define arch_efi_call_virt_setup() efi_virtmap_load() +#define arch_efi_call_virt_teardown() efi_virtmap_unload() -#define __efi_call_virt(f, ...) \ +#define arch_efi_call_virt(f, args...) \ ({ \ efi_##f##_t *__f; \ - \ - efi_virtmap_load(); \ __f = efi.systab->runtime->f; \ - __f(__VA_ARGS__); \ - efi_virtmap_unload(); \ + __f(args); \ }) static inline void efi_set_pgd(struct mm_struct *mm)