Commit d0b9706c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/numa: Add constraints check for nid parameters
  mm, x86: Remove debug_pagealloc_enabled
  x86/mm: Initialize high mem before free_all_bootmem()
  arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
  arch/x86/kernel/e820.c: Eliminate bubble sort from sanitize_e820_map()
  x86: Fix mmap random address range
  x86, mm: Unify zone_sizes_init()
  x86, mm: Prepare zone_sizes_init() for unification
  x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit
  x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32
  x86, mm: Use max_pfn instead of highend_pfn
  x86, mm: Move zone init from paging_init() on 64-bit
  x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit
parents 02d92950 54eed6cb

arch/x86/include/asm/init.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
extern void __init early_ioremap_page_table_range_init(void);

#endif



extern void __init zone_sizes_init(void);



extern unsigned long __init

kernel_physical_mapping_init(unsigned long start,

			     unsigned long end,

arch/x86/kernel/e820.c

+24 −35
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/acpi.h>

#include <linux/firmware-map.h>

#include <linux/memblock.h>

#include <linux/sort.h>



#include <asm/e820.h>

#include <asm/proto.h>
@@ -227,22 +228,38 @@ void __init e820_print_map(char *who) 
 *	   ____________________33__

 *	   ______________________4_

 */



int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,

			     u32 *pnr_map)

{

struct change_member {

	struct e820entry *pbios; /* pointer to original bios entry */

	unsigned long long addr; /* address for this change point */

};



static int __init cpcompare(const void *a, const void *b)

{

	struct change_member * const *app = a, * const *bpp = b;

	const struct change_member *ap = *app, *bp = *bpp;



	/*

	 * Inputs are pointers to two elements of change_point[].  If their

	 * addresses are unequal, their difference dominates.  If the addresses

	 * are equal, then consider one that represents the end of its region

	 * to be greater than one that does not.

	 */

	if (ap->addr != bp->addr)

		return ap->addr > bp->addr ? 1 : -1;



	return (ap->addr != ap->pbios->addr) - (bp->addr != bp->pbios->addr);

}



int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,

			     u32 *pnr_map)

{

	static struct change_member change_point_list[2*E820_X_MAX] __initdata;

	static struct change_member *change_point[2*E820_X_MAX] __initdata;

	static struct e820entry *overlap_list[E820_X_MAX] __initdata;

	static struct e820entry new_bios[E820_X_MAX] __initdata;

	struct change_member *change_tmp;

	unsigned long current_type, last_type;

	unsigned long long last_addr;

	int chgidx, still_changing;

	int chgidx;

	int overlap_entries;

	int new_bios_entry;

	int old_nr, new_nr, chg_nr;
@@ -279,35 +296,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map, 
	chg_nr = chgidx;



	/* sort change-point list by memory addresses (low -> high) */

	still_changing = 1;

	while (still_changing)	{

		still_changing = 0;

		for (i = 1; i < chg_nr; i++)  {

			unsigned long long curaddr, lastaddr;

			unsigned long long curpbaddr, lastpbaddr;



			curaddr = change_point[i]->addr;

			lastaddr = change_point[i - 1]->addr;

			curpbaddr = change_point[i]->pbios->addr;

			lastpbaddr = change_point[i - 1]->pbios->addr;



			/*

			 * swap entries, when:

			 *

			 * curaddr > lastaddr or

			 * curaddr == lastaddr and curaddr == curpbaddr and

			 * lastaddr != lastpbaddr

			 */

			if (curaddr < lastaddr ||

			    (curaddr == lastaddr && curaddr == curpbaddr &&

			     lastaddr != lastpbaddr)) {

				change_tmp = change_point[i];

				change_point[i] = change_point[i-1];

				change_point[i-1] = change_tmp;

				still_changing = 1;

			}

		}

	}

	sort(change_point, chg_nr, sizeof *change_point, cpcompare, NULL);



	/* create a new bios memory map, removing overlaps */

	overlap_entries = 0;	 /* number of entries in the overlap table */

arch/x86/mm/init.c

+23 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/ioport.h>

#include <linux/swap.h>

#include <linux/memblock.h>

#include <linux/bootmem.h>	/* for max_low_pfn */



#include <asm/cacheflush.h>

#include <asm/e820.h>
@@ -15,6 +16,7 @@ 
#include <asm/tlbflush.h>

#include <asm/tlb.h>

#include <asm/proto.h>

#include <asm/dma.h>		/* for MAX_DMA_PFN */



unsigned long __initdata pgt_buf_start;

unsigned long __meminitdata pgt_buf_end;
@@ -392,3 +394,24 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
	free_init_pages("initrd memory", start, PAGE_ALIGN(end));

}

#endif



void __init zone_sizes_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));



#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA]		= MAX_DMA_PFN;

#endif

#ifdef CONFIG_ZONE_DMA32

	max_zone_pfns[ZONE_DMA32]	= MAX_DMA32_PFN;

#endif

	max_zone_pfns[ZONE_NORMAL]	= max_low_pfn;

#ifdef CONFIG_HIGHMEM

	max_zone_pfns[ZONE_HIGHMEM]	= max_pfn;

#endif



	free_area_init_nodes(max_zone_pfns);

}

arch/x86/mm/init_32.c

+11 −18
Original line number Diff line number Diff line
@@ -668,22 +668,6 @@ void __init initmem_init(void) 
}

#endif /* !CONFIG_NEED_MULTIPLE_NODES */



static void __init zone_sizes_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];

	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA] =

		virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

	max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;

#endif



	free_area_init_nodes(max_zone_pfns);

}



void __init setup_bootmem_allocator(void)

{

	printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",
@@ -754,6 +738,17 @@ void __init mem_init(void) 
#ifdef CONFIG_FLATMEM

	BUG_ON(!mem_map);

#endif

	/*

	 * With CONFIG_DEBUG_PAGEALLOC initialization of highmem pages has to

	 * be done before free_all_bootmem(). Memblock use free low memory for

	 * temporary data (see find_range_array()) and for this purpose can use

	 * pages that was already passed to the buddy allocator, hence marked as

	 * not accessible in the page tables when compiled with

	 * CONFIG_DEBUG_PAGEALLOC. Otherwise order of initialization is not

	 * important here.

	 */

	set_highmem_pages_init();



	/* this will put all low memory onto the freelists */

	totalram_pages += free_all_bootmem();
@@ -765,8 +760,6 @@ void __init mem_init(void) 
		if (page_is_ram(tmp) && PageReserved(pfn_to_page(tmp)))

			reservedpages++;



	set_highmem_pages_init();



	codesize =  (unsigned long) &_etext - (unsigned long) &_text;

	datasize =  (unsigned long) &_edata - (unsigned long) &_etext;

	initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;

arch/x86/mm/init_64.c

+1 −10
Original line number Diff line number Diff line
@@ -614,15 +614,6 @@ void __init initmem_init(void) 


void __init paging_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;

#endif

	max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;

	max_zone_pfns[ZONE_NORMAL] = max_pfn;



	sparse_memory_present_with_active_regions(MAX_NUMNODES);

	sparse_init();
@@ -634,7 +625,7 @@ void __init paging_init(void) 
	 */

	node_clear_state(0, N_NORMAL_MEMORY);



	free_area_init_nodes(max_zone_pfns);

	zone_sizes_init();

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE