1 files changed, 2 insertions, 6 deletions

diff --git a/init/main.c b/init/main.c
index 7a92b4ca3aad..df982ff5d2b0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -369,12 +369,8 @@ static void __init setup_per_cpu_areas(void)
         unsigned long nr_possible_cpus = num_possible_cpus();
 
         /* Copy section for each CPU (we discard the original) */
-        size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);
-#ifdef CONFIG_MODULES
-        if (size < PERCPU_ENOUGH_ROOM)
-                size = PERCPU_ENOUGH_ROOM;
-#endif
-        ptr = alloc_bootmem(size * nr_possible_cpus);
+        size = ALIGN(PERCPU_ENOUGH_ROOM, PAGE_SIZE);
+        ptr = alloc_bootmem_pages(size * nr_possible_cpus);
 
         for_each_possible_cpu(i) {
                 __per_cpu_offset[i] = ptr - __per_cpu_start;