---

yaml --- r: 62487 b: refs/heads/master c: dec2e6b h: refs/heads/master i: 62485: 56bb4ab 62483: 9cb0098 62479: bff50fd v: v3
git-mirror · Jul 22, 2007 · 331cd77 · 331cd77
1 parent e66ddcf
commit 331cd77
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;