diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 10:59:22 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 10:59:22 +0400 |
| commit | 604d11d99180806d94a9c48d76f96428dc5bcaa5 (patch) | |
| tree | f4853faccfb144706dd10be1c469d726643bf072 /init/main.c | |
| parent | e28c99a85b3e9ab09944fb285c0c035fa997fa33 (diff) | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| download | linux-604d11d99180806d94a9c48d76f96428dc5bcaa5.tar.xz | |
Merge tag 'v3.8-rc6' into next/dt
Linux 3.8-rc6
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 92d728a32d51..cee4b5c66d81 100644 --- a/init/main.c +++ b/init/main.c @@ -604,7 +604,7 @@ asmlinkage void __init start_kernel(void) pidmap_init(); anon_vma_init(); #ifdef CONFIG_X86 - if (efi_enabled) + if (efi_enabled(EFI_RUNTIME_SERVICES)) efi_enter_virtual_mode(); #endif thread_info_cache_init(); @@ -632,7 +632,7 @@ asmlinkage void __init start_kernel(void) acpi_early_init(); /* before LAPIC and SMP init */ sfi_init_late(); - if (efi_enabled) { + if (efi_enabled(EFI_RUNTIME_SERVICES)) { efi_late_init(); efi_free_boot_services(); } |