diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-05-27 01:27:11 +0400 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-05-27 01:27:10 +0400 |
| commit | cf9daf4a735acaa5ff5967bb1b3a5e3b3578c32a (patch) | |
| tree | 8ef7707be819c491f191e4dd559f839a078ab0f6 /arch/s390 | |
| parent | db705e831ae33fbbeeacf4bb527e0b17de3d6e68 (diff) | |
| download | linux-cf9daf4a735acaa5ff5967bb1b3a5e3b3578c32a.tar.xz | |
[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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 7 | ||||
| -rw-r--r-- | arch/s390/mm/cmm.c | 9 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 79d0ca086820..149c9d8208da 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 fb584aa5c2c6..eb6a2ef5f82e 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 |