Commit 7dc50ec7 authored by Russell King's avatar Russell King
Browse files

ARM: ensure membank array is always sorted 



This was missing from the noMMU code, so there was the possibility
of things not working as expected if out of order memory information
was passed.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c8c90860

arch/arm/mm/init.c

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/highmem.h>

#include <linux/gfp.h>

#include <linux/memblock.h>

#include <linux/sort.h>



#include <asm/mach-types.h>

#include <asm/sections.h>
@@ -256,10 +257,19 @@ static void arm_memory_present(void) 
}

#endif



static int __init meminfo_cmp(const void *_a, const void *_b)

{

	const struct membank *a = _a, *b = _b;

	long cmp = bank_pfn_start(a) - bank_pfn_start(b);

	return cmp < 0 ? -1 : cmp > 0 ? 1 : 0;

}



void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)

{

	int i;



	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);



	memblock_init();

	for (i = 0; i < mi->nr_banks; i++)

		memblock_add(mi->bank[i].start, mi->bank[i].size);

arch/arm/mm/mmu.c

+0 −10
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/mman.h>

#include <linux/nodemask.h>

#include <linux/memblock.h>

#include <linux/sort.h>

#include <linux/fs.h>



#include <asm/cputype.h>
@@ -1011,13 +1010,6 @@ static void __init map_lowmem(void) 
	}

}



static int __init meminfo_cmp(const void *_a, const void *_b)

{

	const struct membank *a = _a, *b = _b;

	long cmp = bank_pfn_start(a) - bank_pfn_start(b);

	return cmp < 0 ? -1 : cmp > 0 ? 1 : 0;

}



/*

 * paging_init() sets up the page tables, initialises the zone memory

 * maps, and sets up the zero page, bad page and bad page tables.
@@ -1026,8 +1018,6 @@ void __init paging_init(struct machine_desc *mdesc) 
{

	void *zero_page;



	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);



	build_mem_type_table();

	sanity_check_meminfo();

	prepare_page_table();