memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants

[linux-2.6-block.git] / arch / x86 / kernel / setup_percpu.c

diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index a006f1ba4c39d93005210667b22ea01f0a51164f..483412fb8a24d6b92db64000fc92429b5c4ba576 100644 (file)
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -114,7 +114,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
                         cpu, size, __pa(ptr));
        } else {
                ptr = memblock_alloc_try_nid_nopanic(size, align, goal,
-                                                    BOOTMEM_ALLOC_ACCESSIBLE,
+                                                    MEMBLOCK_ALLOC_ACCESSIBLE,
                                                     node);
 
                pr_debug("per cpu data for cpu%d %lu bytes on node%d at %016lx\n",