lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm/alpha: unify mem_init() for both UMA and NUMA architectures

Browse Source 
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>
This commit is contained in:
Jiang Liu
2013-07-03 15:04:36 -07:00
committed by Linus Torvalds
parent e1280be0d8
commit 2fb1cd5a28
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/alpha/mm/init.c
View File

@@ -276,17 +276,14 @@ srm_paging_stop (void)
} }
#endif #endif
#ifndef CONFIG_DISCONTIGMEM
void __init void __init
mem_init(void) mem_init(void)
{ {
max_mapnr = max_low_pfn; set_max_mapnr(max_low_pfn);
free_all_bootmem();
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
free_all_bootmem();
mem_init_print_info(NULL); mem_init_print_info(NULL);
} }
#endif /* CONFIG_DISCONTIGMEM */
void void
free_initmem(void) free_initmem(void)

10
arch/alpha/mm/numa.c
View File

@@ -319,13 +319,3 @@ void __init paging_init(void)
/* Initialize the kernel's ZERO_PGE. */ /* Initialize the kernel's ZERO_PGE. */
memset((void *)ZERO_PGE, 0, PAGE_SIZE); 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
}