Commit cf9daf4a authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent db705e83

arch/s390/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -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)

arch/s390/mm/cmm.c

+0 −9
Original line number Diff line number Diff line
@@ -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