diff --git a/[refs] b/[refs] index 8eecc00a6ebc..0b3848ca0baa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7aa6ec56b9e9e95eb6c83516ddbb6159fd11c224 +refs/heads/master: dec2e6b7aa5d45bc3508e19907a7716b0c5307e5 diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c index 314e12b2209f..38f5d6368006 100644 --- a/trunk/arch/x86_64/mm/init.c +++ b/trunk/arch/x86_64/mm/init.c @@ -724,7 +724,7 @@ int in_gate_area_no_task(unsigned long addr) return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END); } -void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) +void * __init alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) { return __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0); diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c index e03b39f3540f..3047bf06c1f3 100644 --- a/trunk/mm/sparse.c +++ b/trunk/mm/sparse.c @@ -209,7 +209,7 @@ static int __meminit sparse_init_one_section(struct mem_section *ms, return 1; } -__attribute__((weak)) +__attribute__((weak)) __init void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) { return NULL;