diff --git a/[refs] b/[refs] index 157a7ebde26d..0aadd62e0c26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1256276c98dbcfb009ac8e0687df9a1e291fd149 +refs/heads/master: 058e7b5814534461b0e2468fce5a8f8d2f43c38f diff --git a/trunk/arch/x86/platform/efi/efi.c b/trunk/arch/x86/platform/efi/efi.c index e2cd38ffc406..ec9f3254c7f1 100644 --- a/trunk/arch/x86/platform/efi/efi.c +++ b/trunk/arch/x86/platform/efi/efi.c @@ -85,7 +85,7 @@ int efi_enabled(int facility) } EXPORT_SYMBOL(efi_enabled); -static bool disable_runtime = false; +static bool __initdata disable_runtime = false; static int __init setup_noefi(char *arg) { disable_runtime = true;