leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[S390] cmm: get rid of CMM_PROC config option

Browse Source 
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>
This commit is contained in:
Heiko Carstens 2010-05-26 23:27:11 +02:00 committed by Martin Schwidefsky
parent db705e831a
commit cf9daf4a73
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/s390/Kconfig
View File

@ -479,13 +479,6 @@ config CMM
Everybody who wants to run Linux under VM should select this Everybody who wants to run Linux under VM should select this
option. 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 config CMM_IUCV
bool "IUCV special message interface to cooperative memory management" bool "IUCV special message interface to cooperative memory management"
depends on CMM && (SMSGIUCV=y || CMM=SMSGIUCV) depends on CMM && (SMSGIUCV=y || CMM=SMSGIUCV)

9
arch/s390/mm/cmm.c
View File

@ -248,8 +248,6 @@ static int cmm_skip_blanks(char *cp, char **endp)
return str != cp; return str != cp;
} }
#ifdef CONFIG_CMM_PROC
static struct ctl_table cmm_table[]; static struct ctl_table cmm_table[];
static int cmm_pages_handler(ctl_table *ctl, int write, void __user *buffer, 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 #ifdef CONFIG_CMM_IUCV
#define SMSG_PREFIX "CMM" #define SMSG_PREFIX "CMM"
@ -434,11 +431,9 @@ static int cmm_init(void)
{ {
int rc = -ENOMEM; int rc = -ENOMEM;
#ifdef CONFIG_CMM_PROC
cmm_sysctl_header = register_sysctl_table(cmm_dir_table); cmm_sysctl_header = register_sysctl_table(cmm_dir_table);
if (!cmm_sysctl_header) if (!cmm_sysctl_header)
goto out_sysctl; goto out_sysctl;
#endif
#ifdef CONFIG_CMM_IUCV #ifdef CONFIG_CMM_IUCV
rc = smsg_register_callback(SMSG_PREFIX, cmm_smsg_target); rc = smsg_register_callback(SMSG_PREFIX, cmm_smsg_target);
if (rc < 0) if (rc < 0)
@ -465,10 +460,8 @@ out_oom_notify:
smsg_unregister_callback(SMSG_PREFIX, cmm_smsg_target); smsg_unregister_callback(SMSG_PREFIX, cmm_smsg_target);
out_smsg: out_smsg:
#endif #endif
#ifdef CONFIG_CMM_PROC
unregister_sysctl_table(cmm_sysctl_header); unregister_sysctl_table(cmm_sysctl_header);
out_sysctl: out_sysctl:
#endif
del_timer_sync(&cmm_timer); del_timer_sync(&cmm_timer);
return rc; return rc;
} }
@ -476,9 +469,7 @@ module_init(cmm_init);
static void cmm_exit(void) static void cmm_exit(void)
{ {
#ifdef CONFIG_CMM_PROC
unregister_sysctl_table(cmm_sysctl_header); unregister_sysctl_table(cmm_sysctl_header);
#endif
#ifdef CONFIG_CMM_IUCV #ifdef CONFIG_CMM_IUCV
smsg_unregister_callback(SMSG_PREFIX, cmm_smsg_target); smsg_unregister_callback(SMSG_PREFIX, cmm_smsg_target);
#endif #endif