summaryrefslogtreecommitdiffstats
path: root/drivers/xen/tmem.c
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-05-08 17:12:44 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-05-15 10:27:47 -0400
commit2ca62b044457e3aacaa06684974b0ff40b2f5a94 (patch)
tree030d10ea6eb3bb31917c275c84963ab5c5f861f8 /drivers/xen/tmem.c
parent9fd19653faceef210f30901f7cee0ceb13c6f39a (diff)
downloadop-kernel-dev-2ca62b044457e3aacaa06684974b0ff40b2f5a94.zip
op-kernel-dev-2ca62b044457e3aacaa06684974b0ff40b2f5a94.tar.gz
xen/tmem: Remove the boot options and fold them in the tmem.X parameters.
If tmem is built-in or a module, the user has the option on the command line to influence it by doing: tmem.<some option> instead of having a variety of "nocleancache", and "nofrontswap". The others: "noselfballooning" and "selfballooning"; and "noselfshrink" are in a different driver xen-selfballoon.c and the patches: xen/tmem: Remove the usage of 'noselfshrink' and use 'tmem.selfshrink' bool instead. xen/tmem: Remove the usage of 'noselfballoon','selfballoon' and use 'tmem.selfballon' bool instead. remove them. Also add documentation. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/tmem.c')
-rw-r--r--drivers/xen/tmem.c28
1 files changed, 4 insertions, 24 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 411c7e3..c1df0ff 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -33,39 +33,19 @@ __setup("tmem", enable_tmem);
#ifdef CONFIG_CLEANCACHE
static bool cleancache __read_mostly = true;
-static bool selfballooning __read_mostly = true;
-#ifdef CONFIG_XEN_TMEM_MODULE
module_param(cleancache, bool, S_IRUGO);
+static bool selfballooning __read_mostly = true;
module_param(selfballooning, bool, S_IRUGO);
-#else
-static int __init no_cleancache(char *s)
-{
- cleancache = false;
- return 1;
-}
-__setup("nocleancache", no_cleancache);
-#endif
#endif /* CONFIG_CLEANCACHE */
#ifdef CONFIG_FRONTSWAP
static bool frontswap __read_mostly = true;
-#ifdef CONFIG_XEN_TMEM_MODULE
module_param(frontswap, bool, S_IRUGO);
-#else
-static int __init no_frontswap(char *s)
-{
- frontswap = false;
- return 1;
-}
-__setup("nofrontswap", no_frontswap);
-#endif
#endif /* CONFIG_FRONTSWAP */
#ifdef CONFIG_XEN_SELFBALLOONING
-static bool frontswap_selfshrinking __read_mostly = true;
-#ifdef CONFIG_XEN_TMEM_MODULE
-module_param(frontswap_selfshrinking, bool, S_IRUGO);
-#endif
+static bool selfshrinking __read_mostly = true;
+module_param(selfshrinking, bool, S_IRUGO);
#endif /* CONFIG_XEN_SELFBALLOONING */
#define TMEM_CONTROL 0
@@ -423,7 +403,7 @@ static int xen_tmem_init(void)
}
#endif
#ifdef CONFIG_XEN_SELFBALLOONING
- xen_selfballoon_init(selfballooning, frontswap_selfshrinking);
+ xen_selfballoon_init(selfballooning, selfshrinking);
#endif
return 0;
}
OpenPOWER on IntegriCloud