diff options
| author | Mark Rutland <[email protected]> | 2016-04-25 21:07:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-04-28 11:34:10 +0200 |
| commit | d9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c (patch) | |
| tree | d88d815743737f58ce90899483ac9f93d5457ab9 | |
| parent | bc25f9dba149a1392b016a6d35300c8d79177298 (diff) | |
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 <[email protected]>
Signed-off-by: Matt Fleming <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Leif Lindholm <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Russell King <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | drivers/firmware/efi/runtime-wrappers.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 0677577bdaa1..b9ece374d4d3 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 |