diff options
-rw-r--r-- | include/linux/bootmem.h | 3 | ||||
-rw-r--r-- | mm/bootmem.c | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 7b74452c5317..3f778c27f825 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
@@ -137,9 +137,6 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, | |||
137 | #define alloc_bootmem_low_pages_node(pgdat, x) \ | 137 | #define alloc_bootmem_low_pages_node(pgdat, x) \ |
138 | __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0) | 138 | __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0) |
139 | 139 | ||
140 | extern int reserve_bootmem_generic(unsigned long addr, unsigned long size, | ||
141 | int flags); | ||
142 | |||
143 | #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP | 140 | #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP |
144 | extern void *alloc_remap(int nid, unsigned long size); | 141 | extern void *alloc_remap(int nid, unsigned long size); |
145 | #else | 142 | #else |
diff --git a/mm/bootmem.c b/mm/bootmem.c index 19262ac05dd2..1324cd74faec 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -460,12 +460,6 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, | |||
460 | return mark_bootmem(start, end, 1, flags); | 460 | return mark_bootmem(start, end, 1, flags); |
461 | } | 461 | } |
462 | 462 | ||
463 | int __weak __init reserve_bootmem_generic(unsigned long phys, unsigned long len, | ||
464 | int flags) | ||
465 | { | ||
466 | return reserve_bootmem(phys, len, flags); | ||
467 | } | ||
468 | |||
469 | static unsigned long __init align_idx(struct bootmem_data *bdata, | 463 | static unsigned long __init align_idx(struct bootmem_data *bdata, |
470 | unsigned long idx, unsigned long step) | 464 | unsigned long idx, unsigned long step) |
471 | { | 465 | { |