diff options
| -rw-r--r-- | arch/x86/mm/init_64.c | 6 | ||||
| -rw-r--r-- | include/linux/bootmem.h | 1 | ||||
| -rw-r--r-- | mm/sparse.c | 11 |
3 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 1e3862e41065..a7308b2cd058 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
| @@ -728,12 +728,6 @@ int in_gate_area_no_task(unsigned long addr) | |||
| 728 | return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END); | 728 | return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END); |
| 729 | } | 729 | } |
| 730 | 730 | ||
| 731 | void * __init alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) | ||
| 732 | { | ||
| 733 | return __alloc_bootmem_core(pgdat->bdata, size, | ||
| 734 | SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0); | ||
| 735 | } | ||
| 736 | |||
| 737 | const char *arch_vma_name(struct vm_area_struct *vma) | 731 | const char *arch_vma_name(struct vm_area_struct *vma) |
| 738 | { | 732 | { |
| 739 | if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) | 733 | if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) |
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index c83534ee1e79..0365ec9fc0c9 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -59,7 +59,6 @@ extern void *__alloc_bootmem_core(struct bootmem_data *bdata, | |||
| 59 | unsigned long align, | 59 | unsigned long align, |
| 60 | unsigned long goal, | 60 | unsigned long goal, |
| 61 | unsigned long limit); | 61 | unsigned long limit); |
| 62 | extern void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size); | ||
| 63 | 62 | ||
| 64 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 63 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
| 65 | extern void reserve_bootmem(unsigned long addr, unsigned long size); | 64 | extern void reserve_bootmem(unsigned long addr, unsigned long size); |
diff --git a/mm/sparse.c b/mm/sparse.c index 08fb14f5eea3..e06f514fe04f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -220,12 +220,6 @@ static int __meminit sparse_init_one_section(struct mem_section *ms, | |||
| 220 | return 1; | 220 | return 1; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | __attribute__((weak)) __init | ||
| 224 | void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size) | ||
| 225 | { | ||
| 226 | return NULL; | ||
| 227 | } | ||
| 228 | |||
| 229 | static unsigned long usemap_size(void) | 223 | static unsigned long usemap_size(void) |
| 230 | { | 224 | { |
| 231 | unsigned long size_bytes; | 225 | unsigned long size_bytes; |
| @@ -267,11 +261,6 @@ struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid) | |||
| 267 | if (map) | 261 | if (map) |
| 268 | return map; | 262 | return map; |
| 269 | 263 | ||
| 270 | map = alloc_bootmem_high_node(NODE_DATA(nid), | ||
| 271 | sizeof(struct page) * PAGES_PER_SECTION); | ||
| 272 | if (map) | ||
| 273 | return map; | ||
| 274 | |||
| 275 | map = alloc_bootmem_node(NODE_DATA(nid), | 264 | map = alloc_bootmem_node(NODE_DATA(nid), |
| 276 | sizeof(struct page) * PAGES_PER_SECTION); | 265 | sizeof(struct page) * PAGES_PER_SECTION); |
| 277 | return map; | 266 | return map; |
