Commit 70b833b5 authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds

[PATCH] x86: consolidate set_max_mapnr_init() implementations

discontig.c has its own version of set_max_mapnr_init().  However, all that it
really does differently from the mm/init.c version is skip setting max_mapnr
(which doesn't exist because there's no mem_map[]).
Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent af916f7d
......@@ -364,12 +364,3 @@ void __init set_highmem_pages_init(int bad_ppro)
totalram_pages += totalhigh_pages;
#endif
}
void __init set_max_mapnr_init(void)
{
#ifdef CONFIG_HIGHMEM
num_physpages = highend_pfn;
#else
num_physpages = max_low_pfn;
#endif
}
......@@ -548,19 +548,22 @@ void __init test_wp_bit(void)
}
}
#ifndef CONFIG_DISCONTIGMEM
static void __init set_max_mapnr_init(void)
{
#ifdef CONFIG_HIGHMEM
max_mapnr = num_physpages = highend_pfn;
num_physpages = highend_pfn;
#else
max_mapnr = num_physpages = max_low_pfn;
num_physpages = max_low_pfn;
#endif
#ifndef CONFIG_DISCONTIGMEM
max_mapnr = num_physpages;
#endif
}
#ifndef CONFIG_DISCONTIGMEM
#define __free_all_bootmem() free_all_bootmem()
#else
#define __free_all_bootmem() free_all_bootmem_node(NODE_DATA(0))
extern void set_max_mapnr_init(void);
#endif /* !CONFIG_DISCONTIGMEM */
static struct kcore_list kcore_mem, kcore_vmalloc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment