diff options
-rw-r--r-- | arch/arc/kernel/unwind.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/setup_percpu.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 183391d4d33a..2a01dd1005f4 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c | |||
@@ -181,8 +181,8 @@ static void init_unwind_hdr(struct unwind_table *table, | |||
181 | */ | 181 | */ |
182 | static void *__init unw_hdr_alloc_early(unsigned long sz) | 182 | static void *__init unw_hdr_alloc_early(unsigned long sz) |
183 | { | 183 | { |
184 | return __alloc_bootmem_nopanic(sz, sizeof(unsigned int), | 184 | return memblock_alloc_from_nopanic(sz, sizeof(unsigned int), |
185 | MAX_DMA_ADDRESS); | 185 | MAX_DMA_ADDRESS); |
186 | } | 186 | } |
187 | 187 | ||
188 | static void *unw_hdr_alloc(unsigned long sz) | 188 | static void *unw_hdr_alloc(unsigned long sz) |
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 67d48e26a8f2..041663abc028 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -106,7 +106,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, | |||
106 | void *ptr; | 106 | void *ptr; |
107 | 107 | ||
108 | if (!node_online(node) || !NODE_DATA(node)) { | 108 | if (!node_online(node) || !NODE_DATA(node)) { |
109 | ptr = __alloc_bootmem_nopanic(size, align, goal); | 109 | ptr = memblock_alloc_from_nopanic(size, align, goal); |
110 | pr_info("cpu %d has no node %d or node-local memory\n", | 110 | pr_info("cpu %d has no node %d or node-local memory\n", |
111 | cpu, node); | 111 | cpu, node); |
112 | pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n", | 112 | pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n", |
@@ -121,7 +121,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, | |||
121 | } | 121 | } |
122 | return ptr; | 122 | return ptr; |
123 | #else | 123 | #else |
124 | return __alloc_bootmem_nopanic(size, align, goal); | 124 | return memblock_alloc_from_nopanic(size, align, goal); |
125 | #endif | 125 | #endif |
126 | } | 126 | } |
127 | 127 | ||