diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-13 21:29:37 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-13 21:29:37 +0200 |
| commit | 6303791f24e88b81b858fbacd26523ac4af8ef83 (patch) | |
| tree | d75a11331a3b775d7db7e281c909b610fb9e03f6 /init | |
| parent | e5cf67e56e4f4e7dc90ea645f011d35ad5f7a271 (diff) | |
| parent | 26a7895e70104811258cf023d06a21f92ab590c6 (diff) | |
| download | kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.zip kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.tar.gz kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.tar.bz2 | |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index d7211fa..841e344 100644 --- a/init/main.c +++ b/init/main.c @@ -549,9 +549,6 @@ asmlinkage void __init start_kernel(void) 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(); /* @@ -783,6 +780,10 @@ static int __init kernel_init(void * unused) * 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 */ |