diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-09-30 19:29:25 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-30 21:34:15 +0100 |
commit | eca73214c9c50e290b8dc823b41730b01788872d (patch) | |
tree | 22df16b626afa6fb9755ce289c6efa254f1ae3d4 /arch/arm/mm/nommu.c | |
parent | da46c79a5418dd6ba006665c1535af0713bb77b9 (diff) | |
download | linux-stable-eca73214c9c50e290b8dc823b41730b01788872d.tar.gz linux-stable-eca73214c9c50e290b8dc823b41730b01788872d.tar.bz2 linux-stable-eca73214c9c50e290b8dc823b41730b01788872d.zip |
[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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/nommu.c')
-rw-r--r-- | arch/arm/mm/nommu.c | 14 |
1 files changed, 14 insertions, 0 deletions
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); } |