---

yaml --- r: 343350 b: refs/heads/master c: 9887090 h: refs/heads/master v: v3
git-mirror · Dec 13, 2012 · a463bee · a463bee
1 parent 1a1efb8
commit a463bee
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66521d5aa6c0f74b5e90c21569acbaa8c5ac0998
+refs/heads/master: 98870901cce098bbe94d90d2c41d8d1fa8d94392
diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h
@@ -137,9 +137,6 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
 #define alloc_bootmem_low_pages_node(pgdat, x) \
 	__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
 
-extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
-				   int flags);
-
 #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
 extern void *alloc_remap(int nid, unsigned long size);
 #else

diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
@@ -460,12 +460,6 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size,
 	return mark_bootmem(start, end, 1, flags);
 }
 
-int __weak __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
-				   int flags)
-{
-	return reserve_bootmem(phys, len, flags);
-}
-
 static unsigned long __init align_idx(struct bootmem_data *bdata,
 				      unsigned long idx, unsigned long step)
 {