git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ifb: Include <linux/sched.h>
[pandora-kernel.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
217ed23
..
5d0eb1d
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-563,9
+563,6
@@
asmlinkage void __init start_kernel(void)
early_boot_irqs_disabled = false;
local_irq_enable();
early_boot_irqs_disabled = false;
local_irq_enable();
- /* Interrupts are enabled now so all GFP allocations are safe. */
- gfp_allowed_mask = __GFP_BITS_MASK;
-
kmem_cache_init_late();
/*
kmem_cache_init_late();
/*
@@
-609,7
+606,7
@@
asmlinkage void __init start_kernel(void)
pidmap_init();
anon_vma_init();
#ifdef CONFIG_X86
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();
efi_enter_virtual_mode();
#endif
thread_info_cache_init();
@@
-798,6
+795,10
@@
static int __init kernel_init(void * unused)
* Wait until kthreadd is all set-up.
*/
wait_for_completion(&kthreadd_done);
* Wait until kthreadd is all set-up.
*/
wait_for_completion(&kthreadd_done);
+
+ /* Now the scheduler is fully set up and can do blocking allocations */
+ gfp_allowed_mask = __GFP_BITS_MASK;
+
/*
* init can allocate pages on any node
*/
/*
* init can allocate pages on any node
*/