diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2016-04-25 21:07:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-28 11:34:08 +0200 |
| commit | 819fc126edcb458f26e9a7fda54bfdd36dfbce06 (patch) | |
| tree | 46bbd88c0419e8deb5b572ed1bee6752b1473ec9 | |
| parent | 489f80f72f7528d2a1b10346657a1a1a42533cea (diff) | |
| download | linux-stable-819fc126edcb458f26e9a7fda54bfdd36dfbce06.tar.gz linux-stable-819fc126edcb458f26e9a7fda54bfdd36dfbce06.tar.bz2 linux-stable-819fc126edcb458f26e9a7fda54bfdd36dfbce06.zip | |
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 <mark.rutland@arm.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
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 <mingo@kernel.org>
| -rw-r--r-- | arch/arm/include/asm/efi.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h index b45fe39bf35b..5f273b43d704 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) |