Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fb1cd5a authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds
Browse files

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: default avatarJiang 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e1280be0

arch/alpha/mm/init.c

+2 −5
Original line number Diff line number Diff line
@@ -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)

arch/alpha/mm/numa.c

+0 −10
Original line number Diff line number Diff line
@@ -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

}