---

yaml
---
r: 199031
b: refs/heads/master
c: cf9daf4
h: refs/heads/master
i:
  199029: 87ec5b2
  199027: 48110a1
  199023: ada8e9f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db705e831ae33fbbeeacf4bb527e0b17de3d6e68
+refs/heads/master: cf9daf4a735acaa5ff5967bb1b3a5e3b3578c32a

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)

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,20 +460,16 @@ 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;
 }
 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