projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[cascardo/linux.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
6af5470
..
baf1f0f
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-463,10
+463,6
@@
static void __init mm_init(void)
percpu_init_late();
pgtable_cache_init();
vmalloc_init();
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)
}
asmlinkage void __init start_kernel(void)
@@
-607,6
+603,10
@@
asmlinkage void __init start_kernel(void)
calibrate_delay();
pidmap_init();
anon_vma_init();
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);
thread_info_cache_init();
cred_init();
fork_init(totalram_pages);
@@
-812,7
+812,6
@@
static int __ref kernel_init(void *unused)
system_state = SYSTEM_RUNNING;
numa_default_policy();
system_state = SYSTEM_RUNNING;
numa_default_policy();
- current->signal->flags |= SIGNAL_UNKILLABLE;
flush_delayed_fput();
if (ramdisk_execute_command) {
flush_delayed_fput();
if (ramdisk_execute_command) {