path: root/arch/x86/kernel
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 16:17:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 16:17:42 -0800
commite3c4877de8b9d93bd47b6ee88eb594b1c1e10da5 (patch)
tree17ade3a3a13b1e7768abe3561b6808dc4980a5f6 /arch/x86/kernel
parent18a44a7ff1075ce5157ac07cde573aca6b5e9973 (diff)
parent6b59e366e074d3962e04f01efb8acc10a33c0e1e (diff)
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/EFI changes from Peter Anvin: - Improve the initrd handling in the EFI boot stub by allowing forward slashes in the pathname - from Chun-Yi Lee. - Cleanup code duplication in the EFI mixed kernel/firmware code - from Satoru Takeuchi. - efivarfs bug fixes for more strict filename validation, with lots of input from Al Viro. * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, efi: remove duplicate code in setup_arch() by using, efi_is_native() efivarfs: guid part of filenames are case-insensitive efivarfs: Validate filenames much more aggressively efivarfs: Use sizeof() instead of magic number x86, efi: Allow slash in file path of initrd
Diffstat (limited to 'arch/x86/kernel')
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 9c857f05cef..e89acdf6b77 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1196,8 +1196,7 @@ void __init setup_arch(char **cmdline_p)
* mismatched firmware/kernel archtectures since there is no
* support for runtime services.
- if (efi_enabled(EFI_BOOT) &&
- IS_ENABLED(CONFIG_X86_64) != efi_enabled(EFI_64BIT)) {
+ if (efi_enabled(EFI_BOOT) && !efi_is_native()) {
pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");