summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorNicolas Pitre2008-10-02 04:29:22 +0200
committerRussell King2008-10-02 23:46:21 +0200
commit3319f5e51a20f3e3c59ed7dac9fc2d5c89aa2d9f (patch)
tree36669425f9ef0ac52fb40859381f8fc3a84f3340 /arch/arm/kernel
parent[ARM] mm: allow LH7A40x to use sparsemem (diff)
downloadkernel-qcow2-linux-3319f5e51a20f3e3c59ed7dac9fc2d5c89aa2d9f.tar.gz
kernel-qcow2-linux-3319f5e51a20f3e3c59ed7dac9fc2d5c89aa2d9f.tar.xz
kernel-qcow2-linux-3319f5e51a20f3e3c59ed7dac9fc2d5c89aa2d9f.zip
[ARM] 5274/1: simplify request_standard_resources()
There is no point converting memory bank addresses from physical to virtual just to convert them back to physical addresses. Furthermore this isn't "right" for highmem even if in this case the end result is the correct one. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/setup.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index e4a975fa2d7e..1f1eecca7f55 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -478,18 +478,13 @@ request_standard_resources(struct meminfo *mi, struct machine_desc *mdesc)
kernel_data.end = virt_to_phys(&_end - 1);
for (i = 0; i < mi->nr_banks; i++) {
- unsigned long virt_start, virt_end;
-
if (mi->bank[i].size == 0)
continue;
- virt_start = __phys_to_virt(mi->bank[i].start);
- virt_end = virt_start + mi->bank[i].size - 1;
-
res = alloc_bootmem_low(sizeof(*res));
res->name = "System RAM";
- res->start = __virt_to_phys(virt_start);
- res->end = __virt_to_phys(virt_end);
+ res->start = mi->bank[i].start;
+ res->end = mi->bank[i].start + mi->bank[i].size - 1;
res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
request_resource(&iomem_resource, res);