summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-05-08 21:58:06 +0200
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-05-15 16:27:44 +0200
commite8f9cb034b1cb633ff920ec65381a2e7ac1d76f2 (patch)
tree936ad5d3e2c25802a62987b786409cb5b218648d
parentxen/tmem: Move all of the boot and module parameters to the top of the file. (diff)
downloadlinux-e8f9cb034b1cb633ff920ec65381a2e7ac1d76f2.tar.xz
linux-e8f9cb034b1cb633ff920ec65381a2e7ac1d76f2.zip
xen/tmem: Split out the different module/boot options.
There are three options - depending on what combination of CONFIG_FRONTSWAP, CONFIG_CLEANCACHE and CONFIG_XEN_SELFBALLOONING is used. Lets split them out nicely out in three groups to make it easier to clean up. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/xen/tmem.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index edf7e18a1c05..c2ee1887806a 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -49,10 +49,8 @@ __setup("nocleancache", no_cleancache);
#ifdef CONFIG_FRONTSWAP
static bool disable_frontswap __read_mostly;
-static bool disable_frontswap_selfshrinking __read_mostly;
#ifdef CONFIG_XEN_TMEM_MODULE
module_param(disable_frontswap, bool, S_IRUGO);
-module_param(disable_frontswap_selfshrinking, bool, S_IRUGO);
#else
static int __init no_frontswap(char *s)
{
@@ -61,8 +59,15 @@ static int __init no_frontswap(char *s)
}
__setup("nofrontswap", no_frontswap);
#endif
-#else /* CONFIG_FRONTSWAP */
+#endif /* CONFIG_FRONTSWAP */
+
+#ifdef CONFIG_FRONTSWAP
+static bool disable_frontswap_selfshrinking __read_mostly;
+#ifdef CONFIG_XEN_TMEM_MODULE
+module_param(disable_frontswap_selfshrinking, bool, S_IRUGO);
+#else
#define disable_frontswap_selfshrinking 1
+#endif
#endif /* CONFIG_FRONTSWAP */
#define TMEM_CONTROL 0