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

Commit 21098b9e authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Move sparse_init() into initmem_init 



We did part of sparse initialisation in setup_arch and part in
initmem_init. Put them together.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Tested-by: default avatarEmil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 68cf0d64

arch/powerpc/kernel/setup_64.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -690,7 +690,6 @@ void __init setup_arch(char **cmdline_p) 
	emergency_stack_init();

	emergency_stack_init();





	initmem_init();

	initmem_init();

	sparse_init();





#ifdef CONFIG_DUMMY_CONSOLE

#ifdef CONFIG_DUMMY_CONSOLE

	conswitchp = &dummy_con;

	conswitchp = &dummy_con;

arch/powerpc/mm/mem.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -205,6 +205,7 @@ void __init initmem_init(void) 




	/* XXX need to clip this if using highmem? */

	/* XXX need to clip this if using highmem? */

	sparse_memory_present_with_active_regions(0);

	sparse_memory_present_with_active_regions(0);

	sparse_init();

}

}





/* mark pages that don't exist as nosave */

/* mark pages that don't exist as nosave */

arch/powerpc/mm/numa.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -966,6 +966,8 @@ void __init initmem_init(void) 
		sparse_memory_present_with_active_regions(nid);

		sparse_memory_present_with_active_regions(nid);

	}

	}





	sparse_init();



	setup_node_to_cpumask_map();

	setup_node_to_cpumask_map();





	reset_numa_cpu_lookup_table();

	reset_numa_cpu_lookup_table();