Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d05444ac2aea59378d1aac95e53c44f0a7a19a4e..d7d5099fe8746f4ea795bd58e8f1d42d511a6ca8 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -749,12 +749,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #ifdef CONFIG_EFI
        if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
-#ifdef CONFIG_X86_32
-                    "EL32",
-#else
-                    "EL64",
-#endif
-        4)) {
+                    EFI_LOADER_SIGNATURE, 4)) {
                efi_enabled = 1;
                efi_memblock_x86_reserve_range();
        }