aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2014-04-11 05:45:40 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-20 02:58:42 -0400
commit71c40f7f8fe1d06ed1e1eafdcf56345eb8c17bf2 (patch)
tree7cbe6cb8e1589f61d5a4d454cf72df4672b6f821
parent6c8cd5bbda7e6be166cf2e2dd4be5890193e17ac (diff)
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>
-rw-r--r--arch/s390/mm/page-states.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/s390/mm/page-states.c b/arch/s390/mm/page-states.c
index 27c50f4d90cb..a90d45e9dfb0 100644
--- a/arch/s390/mm/page-states.c
+++ b/arch/s390/mm/page-states.c
@@ -12,8 +12,6 @@
12#include <linux/mm.h> 12#include <linux/mm.h>
13#include <linux/gfp.h> 13#include <linux/gfp.h>
14#include <linux/init.h> 14#include <linux/init.h>
15#include <asm/setup.h>
16#include <asm/ipl.h>
17 15
18#define ESSA_SET_STABLE 1 16#define ESSA_SET_STABLE 1
19#define ESSA_SET_UNUSED 2 17#define ESSA_SET_UNUSED 2
@@ -43,14 +41,6 @@ void __init cmma_init(void)
43 41
44 if (!cmma_flag) 42 if (!cmma_flag)
45 return; 43 return;
46 /*
47 * Disable CMM for dump, otherwise the tprot based memory
48 * detection can fail because of unstable pages.
49 */
50 if (OLDMEM_BASE || ipl_info.type == IPL_TYPE_FCP_DUMP) {
51 cmma_flag = 0;
52 return;
53 }
54 asm volatile( 44 asm volatile(
55 " .insn rrf,0xb9ab0000,%1,%1,0,0\n" 45 " .insn rrf,0xb9ab0000,%1,%1,0,0\n"
56 "0: la %0,0\n" 46 "0: la %0,0\n"