From 61752481703d36c430128edd2e6d2283cdcd4a38 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sat, 11 Nov 2006 17:25:19 +1100
Subject: [PATCH] --- yaml --- r: 42235 b: refs/heads/master c:
 3d1ea8e8cb4d497a2dd73176cc82095b8f193589 h: refs/heads/master i:   42233:
 f491ab3f591a28b768baa182bba9f1f592eb28d7   42231:
 8b4a73db5402ee7a5444c8a7857f747d150aebbd v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/powerpc/Kconfig               |  1 +
 trunk/arch/powerpc/mm/pgtable_32.c       | 17 -----------------
 trunk/arch/powerpc/platforms/85xx/misc.c |  8 --------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 3cca1128d4f6..2abca75a33c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 165785e5c0be3ad43e8b8eadfbd25e92c2cd002a
+refs/heads/master: 3d1ea8e8cb4d497a2dd73176cc82095b8f193589
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 9547aacc3193..b4a3b699433e 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -247,6 +247,7 @@ config PTE_64BIT
 config PHYS_64BIT
 	bool 'Large physical address support' if E500
 	depends on 44x || E500
+	select RESOURCES_64BIT
 	default y if 44x
 	---help---
 	  This option enables kernel support for larger than 32-bit physical
diff --git a/trunk/arch/powerpc/mm/pgtable_32.c b/trunk/arch/powerpc/mm/pgtable_32.c
index 8fcacb0239da..7750c4425688 100644
--- a/trunk/arch/powerpc/mm/pgtable_32.c
+++ b/trunk/arch/powerpc/mm/pgtable_32.c
@@ -141,28 +141,11 @@ void pte_free(struct page *ptepage)
 	__free_page(ptepage);
 }
 
-#ifndef CONFIG_PHYS_64BIT
 void __iomem *
 ioremap(phys_addr_t addr, unsigned long size)
 {
 	return __ioremap(addr, size, _PAGE_NO_CACHE);
 }
-#else /* CONFIG_PHYS_64BIT */
-void __iomem *
-ioremap64(unsigned long long addr, unsigned long size)
-{
-	return __ioremap(addr, size, _PAGE_NO_CACHE);
-}
-EXPORT_SYMBOL(ioremap64);
-
-void __iomem *
-ioremap(phys_addr_t addr, unsigned long size)
-{
-	phys_addr_t addr64 = fixup_bigphys_addr(addr, size);
-
-	return ioremap64(addr64, size);
-}
-#endif /* CONFIG_PHYS_64BIT */
 EXPORT_SYMBOL(ioremap);
 
 void __iomem *
diff --git a/trunk/arch/powerpc/platforms/85xx/misc.c b/trunk/arch/powerpc/platforms/85xx/misc.c
index 26c5e822c7c8..3e62fcb04c1c 100644
--- a/trunk/arch/powerpc/platforms/85xx/misc.c
+++ b/trunk/arch/powerpc/platforms/85xx/misc.c
@@ -21,11 +21,3 @@ void mpc85xx_restart(char *cmd)
 	local_irq_disable();
 	abort();
 }
-
-/* For now this is a pass through */
-phys_addr_t fixup_bigphys_addr(phys_addr_t addr, phys_addr_t size)
-{
-	return addr;
-};
-
-EXPORT_SYMBOL(fixup_bigphys_addr);