aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 15:17:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 15:17:52 -0700
commitffd386a9a8273dcfa61705d0b349eebc7525ef87 (patch)
tree3a555f07c0df5b21eb2ee49fe57f71a76d0342f7 /init
parent03da30986793385af57eeca3296253c887b742e6 (diff)
parent099a19d91ca429944743d51bef8fee240e94d8e3 (diff)
downloadlinux-linaro-android-ffd386a9a8273dcfa61705d0b349eebc7525ef87.tar.gz
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index a42fdf4aeba..4ddb53f04f2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -532,6 +532,7 @@ static void __init mm_init(void)
page_cgroup_init_flatmem();
mem_init();
kmem_cache_init();
+ percpu_init_late();
pgtable_cache_init();
vmalloc_init();
}