X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Fs390%2Fmm%2Fpage-states.c;h=27c50f4d90cb32ce97db6004ce450096b807655c;hb=614cd4a4ac3daf725508e372bce2160e2d8039a9;hp=a90d45e9dfb0cbb7b1dce5fb8441a249dc0556c3;hpb=67290f41b2715de0e0ae93c9285fcbe37ffc5b22;p=~andy%2Flinux

diff --git a/arch/s390/mm/page-states.c b/arch/s390/mm/page-states.c
index a90d45e9dfb..27c50f4d90c 100644
--- a/arch/s390/mm/page-states.c
+++ b/arch/s390/mm/page-states.c
@@ -12,6 +12,8 @@
 #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
@@ -41,6 +43,14 @@ 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"