From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 22 Sep 2005 20:03:36 +0000 (-0700)
Subject: [SPARC64]: Kill readjust_prom_translations()
X-Git-Tag: v2.6.14-rc3~100^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=40fd3533c93f0062b6d1d8540961ef70fc8ab750;p=linux-2.6-omap-h63xx.git

[SPARC64]: Kill readjust_prom_translations()

Testing shows that the prom_unmap() calls do absolutely
nothing.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 92d09580295..ec47de494c1 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -619,39 +619,6 @@ static void remap_kernel(void)
 	}
 }
 
-static void readjust_prom_translations(void)
-{
-	int nents, i;
-
-	nents = read_obp_translations();
-	for (i = 0; i < nents; i++) {
-		unsigned long vaddr = prom_trans[i].virt;
-		unsigned long size = prom_trans[i].size;
-
-		if (vaddr < 0xf0000000UL) {
-			unsigned long avoid_start = (unsigned long) KERNBASE;
-			unsigned long avoid_end = avoid_start + (4 * 1024 * 1024);
-
-			if (bigkernel)
-				avoid_end += (4 * 1024 * 1024);
-			if (vaddr < avoid_start) {
-				unsigned long top = vaddr + size;
-
-				if (top > avoid_start)
-					top = avoid_start;
-				prom_unmap(top - vaddr, vaddr);
-			}
-			if ((vaddr + size) > avoid_end) {
-				unsigned long bottom = vaddr;
-
-				if (bottom < avoid_end)
-					bottom = avoid_end;
-				prom_unmap((vaddr + size) - bottom, bottom);
-			}
-		}
-	}
-}
-
 static void inherit_prom_mappings(void)
 {
 	int n;
@@ -663,8 +630,6 @@ static void inherit_prom_mappings(void)
 	prom_printf("Remapping the kernel... ");
 	remap_kernel();
 
-	readjust_prom_translations();
-
 	prom_printf("done.\n");
 
 	register_prom_callbacks();