diff options
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 5616661eac01..f6204f712e7c 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -539,6 +539,11 @@ void __init __weak thread_info_cache_init(void) | |||
| 539 | */ | 539 | */ |
| 540 | static void __init mm_init(void) | 540 | static void __init mm_init(void) |
| 541 | { | 541 | { |
| 542 | /* | ||
| 543 | * page_cgroup requires countinous pages as memmap | ||
| 544 | * and it's bigger than MAX_ORDER unless SPARSEMEM. | ||
| 545 | */ | ||
| 546 | page_cgroup_init_flatmem(); | ||
| 542 | mem_init(); | 547 | mem_init(); |
| 543 | kmem_cache_init(); | 548 | kmem_cache_init(); |
| 544 | vmalloc_init(); | 549 | vmalloc_init(); |
| @@ -635,6 +640,7 @@ asmlinkage void __init start_kernel(void) | |||
| 635 | "enabled early\n"); | 640 | "enabled early\n"); |
| 636 | early_boot_irqs_on(); | 641 | early_boot_irqs_on(); |
| 637 | local_irq_enable(); | 642 | local_irq_enable(); |
| 643 | kmem_cache_init_late(); | ||
| 638 | 644 | ||
| 639 | /* | 645 | /* |
| 640 | * HACK ALERT! This is early. We're enabling the console before | 646 | * HACK ALERT! This is early. We're enabling the console before |
