diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:17:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:17:52 -0400 |
| commit | ffd386a9a8273dcfa61705d0b349eebc7525ef87 (patch) | |
| tree | 3a555f07c0df5b21eb2ee49fe57f71a76d0342f7 /init | |
| parent | 03da30986793385af57eeca3296253c887b742e6 (diff) | |
| parent | 099a19d91ca429944743d51bef8fee240e94d8e3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: allow limited allocation before slab is online
percpu: make @dyn_size always mean min dyn_size in first chunk init functions
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index a42fdf4aeba9..4ddb53f04f2a 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -532,6 +532,7 @@ static void __init mm_init(void) | |||
| 532 | page_cgroup_init_flatmem(); | 532 | page_cgroup_init_flatmem(); |
| 533 | mem_init(); | 533 | mem_init(); |
| 534 | kmem_cache_init(); | 534 | kmem_cache_init(); |
| 535 | percpu_init_late(); | ||
| 535 | pgtable_cache_init(); | 536 | pgtable_cache_init(); |
| 536 | vmalloc_init(); | 537 | vmalloc_init(); |
| 537 | } | 538 | } |