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

Commit 59be5a8e authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86: Make 32bit support NO_BOOTMEM 



Let's make 32bit consistent with 64bit.

-v2: Andrew pointed out for 32bit that we should use -1ULL

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-25-git-send-email-yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 53db62a2

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -571,7 +571,6 @@ config PARAVIRT_DEBUG 
config NO_BOOTMEM

	default y

	bool "Disable Bootmem code"

	depends on X86_64

	---help---

	  Use early_res directly instead of bootmem before slab is ready.

		- allocator (buddy) [generic]

arch/x86/kernel/early_res.c

+3 −0
Original line number Diff line number Diff line
@@ -354,6 +354,9 @@ int __init get_free_all_memory_range(struct range **rangep, int nodeid) 


	/* need to go over early_node_map to find out good range for node */

	nr_range = add_from_early_node_map(range, count, nr_range, nodeid);

#ifdef CONFIG_X86_32

	subtract_range(range, count, max_low_pfn, -1ULL);

#endif

	subtract_early_res(range, count);

	nr_range = clean_sort_range(range, count);

arch/x86/mm/init_32.c

+6 −0
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ static void __init zone_sizes_init(void) 
	free_area_init_nodes(max_zone_pfns);

}



#ifndef CONFIG_NO_BOOTMEM

static unsigned long __init setup_node_bootmem(int nodeid,

				 unsigned long start_pfn,

				 unsigned long end_pfn,
@@ -767,9 +768,11 @@ static unsigned long __init setup_node_bootmem(int nodeid, 


	return bootmap + bootmap_size;

}

#endif



void __init setup_bootmem_allocator(void)

{

#ifndef CONFIG_NO_BOOTMEM

	int nodeid;

	unsigned long bootmap_size, bootmap;

	/*
@@ -781,11 +784,13 @@ void __init setup_bootmem_allocator(void) 
	if (bootmap == -1L)

		panic("Cannot find bootmem map of size %ld\n", bootmap_size);

	reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP");

#endif



	printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",

		 max_pfn_mapped<<PAGE_SHIFT);

	printk(KERN_INFO "  low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT);



#ifndef CONFIG_NO_BOOTMEM

	for_each_online_node(nodeid) {

		 unsigned long start_pfn, end_pfn;
@@ -803,6 +808,7 @@ void __init setup_bootmem_allocator(void) 
		bootmap = setup_node_bootmem(nodeid, start_pfn, end_pfn,

						 bootmap);

	}

#endif



	after_bootmem = 1;

}

arch/x86/mm/numa_32.c

+3 −0
Original line number Diff line number Diff line
@@ -418,7 +418,10 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn, 


	for_each_online_node(nid) {

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

		NODE_DATA(nid)->node_id = nid;

#ifndef CONFIG_NO_BOOTMEM

		NODE_DATA(nid)->bdata = &bootmem_node_data[nid];

#endif

	}



	setup_bootmem_allocator();