diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-26 13:13:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-26 13:13:25 -0700 |
| commit | 0a2fe19ccc4bc552a8083a595a3aa737b8bea727 (patch) | |
| tree | 3bed37182f95fa3ac1673530457e994a89bd7e26 /init/main.c | |
| parent | c1b669b72a05aeae0882742dd40f30d51732ed15 (diff) | |
| parent | 9ca8f72a9297f2052d806bd1111e176533aa69bd (diff) | |
| download | linux-0a2fe19ccc4bc552a8083a595a3aa737b8bea727.tar.gz linux-0a2fe19ccc4bc552a8083a595a3aa737b8bea727.tar.bz2 linux-0a2fe19ccc4bc552a8083a595a3aa737b8bea727.zip | |
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pul x86/efi changes from Ingo Molnar:
"This tree adds an EFI bootloader handover protocol, which, once
supported on the bootloader side, will make bootup faster and might
result in simpler bootloaders.
The other change activates the EFI wall clock time accessors on x86-64
as well, instead of the legacy RTC readout."
* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, efi: Handover Protocol
x86-64/efi: Use EFI to deal with platform wall clock
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c index 3f151f6c6da7..eb72a5c4c844 100644 --- a/init/main.c +++ b/init/main.c @@ -461,6 +461,10 @@ static void __init mm_init(void) percpu_init_late(); pgtable_cache_init(); vmalloc_init(); +#ifdef CONFIG_X86 + if (efi_enabled) + efi_enter_virtual_mode(); +#endif } asmlinkage void __init start_kernel(void) @@ -602,10 +606,6 @@ asmlinkage void __init start_kernel(void) calibrate_delay(); pidmap_init(); anon_vma_init(); -#ifdef CONFIG_X86 - if (efi_enabled) - efi_enter_virtual_mode(); -#endif thread_info_cache_init(); cred_init(); fork_init(totalram_pages); |