From 5ed5fdf50cbe8195522e2176d6356b357c0c963f Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 6 Sep 2008 11:23:30 +0100 Subject: [ARM] clean up a load of old declarations ... some of which are now in linux/*.h headers. Signed-off-by: Russell King --- arch/arm/mm/nommu.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/mm/nommu.c') diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 63c62fdea521..4bc767d1cedf 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -15,8 +15,6 @@ #include "mm.h" -extern void _stext, __data_start, _end; - /* * Reserve the various regions of node 0 */ -- cgit v1.2.2 From fced80c735941fa518ac67c0b61bbe153fb8c050 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 6 Sep 2008 12:10:45 +0100 Subject: [ARM] Convert asm/io.h to linux/io.h Signed-off-by: Russell King --- arch/arm/mm/nommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mm/nommu.c') diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 4bc767d1cedf..81a3000973b4 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -7,9 +7,9 @@ #include #include #include +#include #include -#include #include #include -- cgit v1.2.2 From eca73214c9c50e290b8dc823b41730b01788872d Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 30 Sep 2008 19:29:25 +0100 Subject: [ARM] mm: move validation of membanks to one place The newly introduced sanity_check_meminfo() function should be used to collect all validation of the meminfo array, which we have in bootmem_init(). Move it there. Signed-off-by: Russell King --- arch/arm/mm/nommu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'arch/arm/mm/nommu.c') diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 81a3000973b4..07b62b238979 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -41,12 +41,26 @@ void __init reserve_node_zero(pg_data_t *pgdat) BOOTMEM_DEFAULT); } +static void __init sanity_check_meminfo(struct meminfo *mi) +{ + int i, j; + + for (i = 0, j = 0; i < mi->nr_banks; i++) { + struct membank *mb = &mi->bank[i]; + + if (mb->size != 0 && mb->node < MAX_NUMNODES) + mi->bank[j++] = mi->bank[i]; + } + mi->nr_banks = j; +} + /* * paging_init() sets up the page tables, initialises the zone memory * maps, and sets up the zero page, bad page and bad page tables. */ void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc) { + sanity_check_meminfo(mi); bootmem_init(mi); } -- cgit v1.2.2