[PATCH] ppc64: Remove CONFIG_MSCHUNKS

[linux-2.6-omap-h63xx.git] / include / asm-ppc64 / abs_addr.h

diff --git a/include/asm-ppc64/abs_addr.h b/include/asm-ppc64/abs_addr.h
index 200db1c45f292a0b325793bee16126504f19bad3..84c24d4cdb71a1e5234a3abec11308468b96528f 100644 (file)
--- a/include/asm-ppc64/abs_addr.h
+++ b/include/asm-ppc64/abs_addr.h
@@ -16,8 +16,7 @@
 #include <asm/page.h>
 #include <asm/prom.h>
 #include <asm/lmb.h>
-
-#ifdef CONFIG_MSCHUNKS
+#include <asm/firmware.h>
 
 struct mschunks_map {
         unsigned long num_chunks;
@@ -48,6 +47,10 @@ static inline unsigned long phys_to_abs(unsigned long pa)
 {
        unsigned long chunk;
 
+       /* This is a no-op on non-iSeries */
+       if (!firmware_has_feature(FW_FEATURE_ISERIES))
+               return pa;
+
        chunk = addr_to_chunk(pa);
 
        if (chunk < mschunks_map.num_chunks)
@@ -56,18 +59,6 @@ static inline unsigned long phys_to_abs(unsigned long pa)
        return chunk_to_addr(chunk) + (pa & MSCHUNKS_OFFSET_MASK);
 }
 
-#else  /* !CONFIG_MSCHUNKS */
-
-#define chunk_to_addr(chunk) ((unsigned long)(chunk))
-#define addr_to_chunk(addr) (addr)
-#define chunk_offset(addr) (0)
-#define abs_chunk(pchunk) (pchunk)
-
-#define phys_to_abs(pa) (pa)
-#define physRpn_to_absRpn(rpn) (rpn)
-
-#endif /* !CONFIG_MSCHUNKS */
-
 /* Convenience macros */
 #define virt_to_abs(va) phys_to_abs(__pa(va))
 #define abs_to_virt(aa) __va(aa)