diff options
| author | Jiang Liu <liuj97@gmail.com> | 2013-07-04 02:04:36 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 03:07:39 +0400 |
| commit | 2fb1cd5a283a7c40457731415c6e6432f061edc2 (patch) | |
| tree | b85f17840ed12e2bbca04c063cb0405b1c61b941 /arch | |
| parent | e1280be0d8614be94e5bef48b6c830dfa03e82a7 (diff) | |
| download | linux-2fb1cd5a283a7c40457731415c6e6432f061edc2.tar.xz | |
mm/alpha: unify mem_init() for both UMA and NUMA architectures
Now mem_init() for both Alpha UMA and Alpha NUMA are the same, so unify it
to reduce duplicated code.
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/mm/init.c | 7 | ||||
| -rw-r--r-- | arch/alpha/mm/numa.c | 10 |
2 files changed, 2 insertions, 15 deletions
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index af91010990b0..a1bea91df56a 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -276,17 +276,14 @@ srm_paging_stop (void) } #endif -#ifndef CONFIG_DISCONTIGMEM void __init mem_init(void) { - max_mapnr = max_low_pfn; - free_all_bootmem(); + set_max_mapnr(max_low_pfn); high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); - + free_all_bootmem(); mem_init_print_info(NULL); } -#endif /* CONFIG_DISCONTIGMEM */ void free_initmem(void) diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index 0894b3a8b70f..d543d71c28b4 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c @@ -319,13 +319,3 @@ void __init paging_init(void) /* Initialize the kernel's ZERO_PGE. */ memset((void *)ZERO_PGE, 0, PAGE_SIZE); } - -void __init mem_init(void) -{ - high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT); - free_all_bootmem(); - mem_init_print_info(NULL); -#if 0 - mem_stress(); -#endif -} |