aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/mm/init.c2
-rw-r--r--mm/sparse.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 314e12b2209f..38f5d6368006 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -724,7 +724,7 @@ int in_gate_area_no_task(unsigned long addr)
724 return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END); 724 return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
725} 725}
726 726
727void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) 727void * __init alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size)
728{ 728{
729 return __alloc_bootmem_core(pgdat->bdata, size, 729 return __alloc_bootmem_core(pgdat->bdata, size,
730 SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0); 730 SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0);
diff --git a/mm/sparse.c b/mm/sparse.c
index e03b39f3540f..3047bf06c1f3 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -209,7 +209,7 @@ static int __meminit sparse_init_one_section(struct mem_section *ms,
209 return 1; 209 return 1;
210} 210}
211 211
212__attribute__((weak)) 212__attribute__((weak)) __init
213void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) 213void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size)
214{ 214{
215 return NULL; 215 return NULL;