diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-07 17:40:33 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 10:57:35 +0100 |
commit | be370302742ff9948f2a42b15cb2ba174d97b930 (patch) | |
tree | 977bfa71c1e1483c22a40d85dfd3b233e5ac5d06 /arch/arm/kernel/setup.c | |
parent | 7961239599de71130c852ecfa9a4140f3f60547b (diff) | |
download | op-kernel-dev-be370302742ff9948f2a42b15cb2ba174d97b930.zip op-kernel-dev-be370302742ff9948f2a42b15cb2ba174d97b930.tar.gz |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 122d999..387d2e9 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) size -= start & ~PAGE_MASK; bank->start = PAGE_ALIGN(start); bank->size = size & PAGE_MASK; - bank->node = PHYS_TO_NID(start); /* * Check whether this memory region has non-zero size or * invalid node number. */ - if (bank->size == 0 || bank->node >= MAX_NUMNODES) + if (bank->size == 0) return -EINVAL; meminfo.nr_banks++; |