Commit d9c6e1d0 authored Apr 25, 2016 by Mark Rutland Committed by Ingo Molnar Apr 28, 2016

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 <mark.rutland@arm.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.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-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 <mingo@kernel.org>

parent bc25f9db

drivers/firmware/efi/runtime-wrappers.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,6 @@
	* Restores the usual kernel environment once the call has returned.		* Restores the usual kernel environment once the call has returned.
	*/		*/

	#ifndef efi_call_virt
	#define efi_call_virt(f, args...) \		#define efi_call_virt(f, args...) \
	({ \		({ \
	efi_status_t __s; \		efi_status_t __s; \
	@@ -49,16 +48,13 @@
	arch_efi_call_virt_teardown(); \		arch_efi_call_virt_teardown(); \
	__s; \		__s; \
	})		})
	#endif

	#ifndef __efi_call_virt
	#define __efi_call_virt(f, args...) \		#define __efi_call_virt(f, args...) \
	({ \		({ \
	arch_efi_call_virt_setup(); \		arch_efi_call_virt_setup(); \
	arch_efi_call_virt(f, args); \		arch_efi_call_virt(f, args); \
	arch_efi_call_virt_teardown(); \		arch_efi_call_virt_teardown(); \
	})		})
	#endif

	/*		/*
	* According to section 7.1 of the UEFI spec, Runtime Services are not fully		* According to section 7.1 of the UEFI spec, Runtime Services are not fully