summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2014-04-11 11:45:40 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-20 08:58:42 +0200
commit71c40f7f8fe1d06ed1e1eafdcf56345eb8c17bf2 (patch)
tree7cbe6cb8e1589f61d5a4d454cf72df4672b6f821 /arch/s390
parent6c8cd5bbda7e6be166cf2e2dd4be5890193e17ac (diff)
downloadlinux-71c40f7f8fe1d06ed1e1eafdcf56345eb8c17bf2.tar.bz2
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>
Diffstat (limited to 'arch/s390')
-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 @@
#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"