Browse Source

[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>
Nicolas Pitre 16 years ago
parent
commit
3319f5e51a
1 changed files with 2 additions and 7 deletions
  1. 2 7
      arch/arm/kernel/setup.c

+ 2 - 7
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);
 	kernel_data.end     = virt_to_phys(&_end - 1);
 
 
 	for (i = 0; i < mi->nr_banks; i++) {
 	for (i = 0; i < mi->nr_banks; i++) {
-		unsigned long virt_start, virt_end;
-
 		if (mi->bank[i].size == 0)
 		if (mi->bank[i].size == 0)
 			continue;
 			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 = alloc_bootmem_low(sizeof(*res));
 		res->name  = "System RAM";
 		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;
 		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
 
 
 		request_resource(&iomem_resource, res);
 		request_resource(&iomem_resource, res);