aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-07 12:40:33 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-16 05:57:35 -0400
commitbe370302742ff9948f2a42b15cb2ba174d97b930 (patch)
tree977bfa71c1e1483c22a40d85dfd3b233e5ac5d06 /arch/arm/kernel/setup.c
parent7961239599de71130c852ecfa9a4140f3f60547b (diff)
ARM: Remove DISCONTIGMEM support
Everything should now be using sparsemem rather than discontigmem, so remove the code supporting discontigmem from ARM. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 122d999bdc7c..387d2e9cb51f 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -402,13 +402,12 @@ static int __init arm_add_memory(unsigned long start, unsigned long size)
402 size -= start & ~PAGE_MASK; 402 size -= start & ~PAGE_MASK;
403 bank->start = PAGE_ALIGN(start); 403 bank->start = PAGE_ALIGN(start);
404 bank->size = size & PAGE_MASK; 404 bank->size = size & PAGE_MASK;
405 bank->node = PHYS_TO_NID(start);
406 405
407 /* 406 /*
408 * Check whether this memory region has non-zero size or 407 * Check whether this memory region has non-zero size or
409 * invalid node number. 408 * invalid node number.
410 */ 409 */
411 if (bank->size == 0 || bank->node >= MAX_NUMNODES) 410 if (bank->size == 0)
412 return -EINVAL; 411 return -EINVAL;
413 412
414 meminfo.nr_banks++; 413 meminfo.nr_banks++;