forked from Minki/linux
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>
This commit is contained in:
parent
e1280be0d8
commit
2fb1cd5a28
@ -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)
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user