s390/cmma: remove "cmma disable" code in case of dump again

This is not necessary anymore, since the offending code is gone with
the conversion to the memblock code.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>-
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/mm/page-states.c b/arch/s390/mm/page-states.c
index 27c50f4d90cb32ce97db6004ce450096b807655c..a90d45e9dfb0cbb7b1dce5fb8441a249dc0556c3 100644 (file)
--- a/arch/s390/mm/page-states.c
+++ b/arch/s390/mm/page-states.c
@@ -12,8 +12,6 @@
 #include <linux/mm.h>
 #include <linux/gfp.h>
 #include <linux/init.h>
-#include <asm/setup.h>
-#include <asm/ipl.h>
 
 #define ESSA_SET_STABLE                1
 #define ESSA_SET_UNUSED                2
@@ -43,14 +41,6 @@ void __init cmma_init(void)
 
        if (!cmma_flag)
                return;
-       /*
-        * Disable CMM for dump, otherwise  the tprot based memory
-        * detection can fail because of unstable pages.
-        */
-       if (OLDMEM_BASE || ipl_info.type == IPL_TYPE_FCP_DUMP) {
-               cmma_flag = 0;
-               return;
-       }
        asm volatile(
                "       .insn rrf,0xb9ab0000,%1,%1,0,0\n"
                "0:     la      %0,0\n"