From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 26 May 2010 21:27:11 +0000 (+0200)
Subject: [S390] cmm: get rid of CMM_PROC config option
X-Git-Tag: v2.6.35-rc1~34^2~2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=cf9daf4a735acaa5ff5967bb1b3a5e3b3578c32a;p=~andy%2Flinux

[S390] cmm: get rid of CMM_PROC config option

All distros have this option switched on, so lets get rid of at least
one of the tons of config options that are available.

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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 79d0ca08682..149c9d8208d 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -479,13 +479,6 @@ config CMM
 	  Everybody who wants to run Linux under VM should select this
 	  option.
 
-config CMM_PROC
-	bool "/proc interface to cooperative memory management"
-	depends on CMM
-	help
-	  Select this option to enable the /proc interface to the
-	  cooperative memory management.
-
 config CMM_IUCV
 	bool "IUCV special message interface to cooperative memory management"
 	depends on CMM && (SMSGIUCV=y || CMM=SMSGIUCV)
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index fb584aa5c2c..eb6a2ef5f82 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -248,8 +248,6 @@ static int cmm_skip_blanks(char *cp, char **endp)
 	return str != cp;
 }
 
-#ifdef CONFIG_CMM_PROC
-
 static struct ctl_table cmm_table[];
 
 static int cmm_pages_handler(ctl_table *ctl, int write, void __user *buffer,
@@ -356,7 +354,6 @@ static struct ctl_table cmm_dir_table[] = {
 	},
 	{ }
 };
-#endif
 
 #ifdef CONFIG_CMM_IUCV
 #define SMSG_PREFIX "CMM"
@@ -434,11 +431,9 @@ static int cmm_init(void)
 {
 	int rc = -ENOMEM;
 
-#ifdef CONFIG_CMM_PROC
 	cmm_sysctl_header = register_sysctl_table(cmm_dir_table);
 	if (!cmm_sysctl_header)
 		goto out_sysctl;
-#endif
 #ifdef CONFIG_CMM_IUCV
 	rc = smsg_register_callback(SMSG_PREFIX, cmm_smsg_target);
 	if (rc < 0)
@@ -465,10 +460,8 @@ out_oom_notify:
 	smsg_unregister_callback(SMSG_PREFIX, cmm_smsg_target);
 out_smsg:
 #endif
-#ifdef CONFIG_CMM_PROC
 	unregister_sysctl_table(cmm_sysctl_header);
 out_sysctl:
-#endif
 	del_timer_sync(&cmm_timer);
 	return rc;
 }
@@ -476,9 +469,7 @@ module_init(cmm_init);
 
 static void cmm_exit(void)
 {
-#ifdef CONFIG_CMM_PROC
 	unregister_sysctl_table(cmm_sysctl_header);
-#endif
 #ifdef CONFIG_CMM_IUCV
 	smsg_unregister_callback(SMSG_PREFIX, cmm_smsg_target);
 #endif