From 2d34adf0a34873fd469e7b7114a7d8e69632f3b2 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 3 Aug 2005 20:21:25 +1000
Subject: [PATCH] --- yaml --- r: 6211 b: refs/heads/master c:
 e88bcd1b29f63738b702e57d831758706162347e h: refs/heads/master i:   6209:
 e39ee200a3a92b05b6d2b350a46ef2cb85c242ae   6207:
 afe06d6fed31112d621c7d682207fe7297f505c0 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/ppc64/kernel/lmb.c      | 19 -------------------
 trunk/arch/ppc64/mm/init.c         |  4 +---
 trunk/include/asm-ppc64/abs_addr.h |  6 +-----
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 342662146d3e..19d16be4c778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4a0f97020444f83bf22bb9c8c20d8af2b4e6317
+refs/heads/master: e88bcd1b29f63738b702e57d831758706162347e
diff --git a/trunk/arch/ppc64/kernel/lmb.c b/trunk/arch/ppc64/kernel/lmb.c
index 6cb275615fc4..111da736652b 100644
--- a/trunk/arch/ppc64/kernel/lmb.c
+++ b/trunk/arch/ppc64/kernel/lmb.c
@@ -313,25 +313,6 @@ lmb_end_of_DRAM(void)
 	return 0;
 }
 
-unsigned long __init
-lmb_abs_to_phys(unsigned long aa)
-{
-	unsigned long i, pa = aa;
-	struct lmb *_lmb = &lmb;
-	struct lmb_region *_mem = &(_lmb->memory);
-
-	for (i=0; i < _mem->cnt; i++) {
-		unsigned long lmbbase = _mem->region[i].base;
-		unsigned long lmbsize = _mem->region[i].size;
-		if ( lmb_addrs_overlap(aa,1,lmbbase,lmbsize) ) {
-			pa = _mem->region[i].physbase + (aa - lmbbase);
-			break;
-		}
-	}
-
-	return pa;
-}
-
 /*
  * Truncate the lmb list to memory_limit if it's set
  * You must call lmb_analyze() after this.
diff --git a/trunk/arch/ppc64/mm/init.c b/trunk/arch/ppc64/mm/init.c
index 9edfe267123e..a16cf12c586b 100644
--- a/trunk/arch/ppc64/mm/init.c
+++ b/trunk/arch/ppc64/mm/init.c
@@ -42,7 +42,6 @@
 
 #include <asm/pgalloc.h>
 #include <asm/page.h>
-#include <asm/abs_addr.h>
 #include <asm/prom.h>
 #include <asm/lmb.h>
 #include <asm/rtas.h>
@@ -167,7 +166,6 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags)
 		ptep = pte_alloc_kernel(&init_mm, pmdp, ea);
 		if (!ptep)
 			return -ENOMEM;
-		pa = abs_to_phys(pa);
 		set_pte_at(&init_mm, ea, ptep, pfn_pte(pa >> PAGE_SHIFT,
 							  __pgprot(flags)));
 		spin_unlock(&init_mm.page_table_lock);
@@ -547,7 +545,7 @@ void __init do_init_bootmem(void)
 	 */
 	bootmap_pages = bootmem_bootmap_pages(total_pages);
 
-	start = abs_to_phys(lmb_alloc(bootmap_pages<<PAGE_SHIFT, PAGE_SIZE));
+	start = lmb_alloc(bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
 	BUG_ON(!start);
 
 	boot_mapsize = init_bootmem(start >> PAGE_SHIFT, total_pages);
diff --git a/trunk/include/asm-ppc64/abs_addr.h b/trunk/include/asm-ppc64/abs_addr.h
index ab4320c1cf5b..200db1c45f29 100644
--- a/trunk/include/asm-ppc64/abs_addr.h
+++ b/trunk/include/asm-ppc64/abs_addr.h
@@ -56,9 +56,6 @@ static inline unsigned long phys_to_abs(unsigned long pa)
 	return chunk_to_addr(chunk) + (pa & MSCHUNKS_OFFSET_MASK);
 }
 
-/* A macro so it can take pointers or unsigned long. */
-#define abs_to_phys(aa) lmb_abs_to_phys((unsigned long)(aa))
-
 #else  /* !CONFIG_MSCHUNKS */
 
 #define chunk_to_addr(chunk) ((unsigned long)(chunk))
@@ -68,12 +65,11 @@ static inline unsigned long phys_to_abs(unsigned long pa)
 
 #define phys_to_abs(pa) (pa)
 #define physRpn_to_absRpn(rpn) (rpn)
-#define abs_to_phys(aa) (aa)
 
 #endif /* !CONFIG_MSCHUNKS */
 
 /* Convenience macros */
 #define virt_to_abs(va) phys_to_abs(__pa(va))
-#define abs_to_virt(aa) __va(abs_to_phys(aa))
+#define abs_to_virt(aa) __va(aa)
 
 #endif /* _ABS_ADDR_H */