3 files changed, 5 insertions, 21 deletions

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 4d4f81c65012..13b262f10216 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -302,12 +302,6 @@ config GENERIC_HARDIRQS
         bool
         default y
 
-config MSCHUNKS
-        bool
-        depends on PPC_ISERIES
-        default y
-
-
 config PPC_RTAS
         bool
         depends on PPC_PSERIES || PPC_BPA
diff --git a/arch/ppc64/configs/iSeries_defconfig b/arch/ppc64/configs/iSeries_defconfig
index 394ba18b58c7..219c6677abcc 100644
--- a/arch/ppc64/configs/iSeries_defconfig
+++ b/arch/ppc64/configs/iSeries_defconfig
@@ -99,7 +99,6 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_MSCHUNKS=y
 CONFIG_LPARCFG=y
 CONFIG_SECCOMP=y
 CONFIG_ISA_DMA_API=y
diff --git a/include/asm-ppc64/abs_addr.h b/include/asm-ppc64/abs_addr.h
index 200db1c45f29..84c24d4cdb71 100644
--- 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)