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

Commit 11cd0bc1 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: move some func calling from setup_arch to paging_init 



those function depend on paging setup pgtable, so they could access
the ram in bootmem region but just get mapped.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c0943457

arch/x86/kernel/setup_32.c

+2 −32
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static void __init reserve_initrd(void) 


#define MAX_MAP_CHUNK	(NR_FIX_BTMAPS << PAGE_SHIFT)



static void __init post_reserve_initrd(void)

void __init post_reserve_initrd(void)

{

	u64 ramdisk_image = boot_params.hdr.ramdisk_image;

	u64 ramdisk_size  = boot_params.hdr.ramdisk_size;
@@ -307,29 +307,11 @@ static void __init post_reserve_initrd(void) 
void __init reserve_initrd(void)

{

}

static void __init post_reserve_initrd(void)

void __init post_reserve_initrd(void)

{

}

#endif /* CONFIG_BLK_DEV_INITRD */



/*

 * The node 0 pgdat is initialized before all of these because

 * it's needed for bootmem.  node>0 pgdats have their virtual

 * space allocated before the pagetables are in place to access

 * them, so they can't be cleared then.

 *

 * This should all compile down to nothing when NUMA is off.

 */

static void __init remapped_pgdat_init(void)

{

	int nid;



	for_each_online_node(nid) {

		if (nid != 0)

			memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));

	}

}



#ifdef CONFIG_MCA

static void set_mca_bus(int x)

{
@@ -524,18 +506,6 @@ void __init setup_arch(char **cmdline_p) 
		init_ohci1394_dma_on_all_controllers();

#endif



	/*

	 * NOTE: at this point the bootmem allocator is fully available.

	 */



	post_reserve_initrd();



	remapped_pgdat_init();

	sparse_init();

	zone_sizes_init();



	paravirt_post_allocator_init();



#ifdef CONFIG_X86_GENERICARCH

	generic_apic_probe();

#endif

arch/x86/mm/init_32.c

+29 −0
Original line number Diff line number Diff line
@@ -705,6 +705,23 @@ void __init setup_bootmem_allocator(void) 


}



/*

 * The node 0 pgdat is initialized before all of these because

 * it's needed for bootmem.  node>0 pgdats have their virtual

 * space allocated before the pagetables are in place to access

 * them, so they can't be cleared then.

 *

 * This should all compile down to nothing when NUMA is off.

 */

static void __init remapped_pgdat_init(void)

{

	int nid;



	for_each_online_node(nid) {

		if (nid != 0)

			memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));

	}

}



/*

 * paging_init() sets up the page tables - note that the first 8MB are
@@ -727,6 +744,18 @@ void __init paging_init(void) 
	__flush_tlb_all();



	kmap_init();



	/*

	 * NOTE: at this point the bootmem allocator is fully available.

	 */



	post_reserve_initrd();



	remapped_pgdat_init();

	sparse_init();

	zone_sizes_init();



	paravirt_post_allocator_init();

}



/*

include/asm-x86/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void reserve_crashkernel(void); 
#include <asm/bootparam.h>



void reserve_standard_io_resources(void);

extern void post_reserve_initrd(void);



#ifndef _SETUP