From ece4f2723b0645bbcc885e9c4ebba4e07c2ba331 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 26 May 2010 23:27:11 +0200
Subject: [PATCH] --- yaml --- r: 199031 b: refs/heads/master c:
 cf9daf4a735acaa5ff5967bb1b3a5e3b3578c32a h: refs/heads/master i:   199029:
 87ec5b2cda5d57619f698994785056d98279dbc2   199027:
 48110a1edf5362e83cf1985eb26614d97709ffa8   199023:
 ada8e9fd3b2c578d2d18f28cbb377d2d8a805383 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/s390/Kconfig  | 7 -------
 trunk/arch/s390/mm/cmm.c | 9 ---------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 1fc9bece6863..f4307f5596ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db705e831ae33fbbeeacf4bb527e0b17de3d6e68
+refs/heads/master: cf9daf4a735acaa5ff5967bb1b3a5e3b3578c32a
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 79d0ca086820..149c9d8208da 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/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/trunk/arch/s390/mm/cmm.c b/trunk/arch/s390/mm/cmm.c
index fb584aa5c2c6..eb6a2ef5f82e 100644
--- a/trunk/arch/s390/mm/cmm.c
+++ b/trunk/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 @@ static int cmm_init(void)
 	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