aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/xen-selfballoon.c
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-05-08 16:44:06 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-05-15 10:27:48 -0400
commit54598d1b034624dc0817fca3f2c7fd914938b7c8 (patch)
tree6d42173eb0ca7336d8f144de17cd6299fba43988 /drivers/xen/xen-selfballoon.c
parent2ca62b044457e3aacaa06684974b0ff40b2f5a94 (diff)
xen/tmem: Remove the usage of 'noselfshrink' and use 'tmem.selfshrink' bool instead.
As the 'tmem' driver is the one that actually sets whether it will use it or not so might as well make tmem responsible for this knob. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/xen-selfballoon.c')
-rw-r--r--drivers/xen/xen-selfballoon.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c
index f2ef569c7cc1..012f9d9bf5f4 100644
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@ -60,8 +60,8 @@
60 * be enabled with the "selfballooning" kernel boot option; similarly 60 * be enabled with the "selfballooning" kernel boot option; similarly
61 * selfballooning is enabled by default if frontswap is configured and 61 * selfballooning is enabled by default if frontswap is configured and
62 * can be disabled with the "noselfballooning" kernel boot option. Finally, 62 * can be disabled with the "noselfballooning" kernel boot option. Finally,
63 * when frontswap is configured, frontswap-selfshrinking can be disabled 63 * when frontswap is configured,frontswap-selfshrinking can be disabled
64 * with the "noselfshrink" kernel boot option. 64 * with the "tmem.selfshrink=0" kernel boot option.
65 * 65 *
66 * Selfballooning is disallowed in domain0 and force-disabled. 66 * Selfballooning is disallowed in domain0 and force-disabled.
67 * 67 *
@@ -120,9 +120,6 @@ static DECLARE_DELAYED_WORK(selfballoon_worker, selfballoon_process);
120/* Enable/disable with sysfs. */ 120/* Enable/disable with sysfs. */
121static bool frontswap_selfshrinking __read_mostly; 121static bool frontswap_selfshrinking __read_mostly;
122 122
123/* Enable/disable with kernel boot option. */
124static bool use_frontswap_selfshrink = true;
125
126/* 123/*
127 * The default values for the following parameters were deemed reasonable 124 * The default values for the following parameters were deemed reasonable
128 * by experimentation, may be workload-dependent, and can all be 125 * by experimentation, may be workload-dependent, and can all be
@@ -176,14 +173,6 @@ static void frontswap_selfshrink(void)
176 frontswap_shrink(tgt_frontswap_pages); 173 frontswap_shrink(tgt_frontswap_pages);
177} 174}
178 175
179static int __init xen_nofrontswap_selfshrink_setup(char *s)
180{
181 use_frontswap_selfshrink = false;
182 return 1;
183}
184
185__setup("noselfshrink", xen_nofrontswap_selfshrink_setup);
186
187/* Disable with kernel boot option. */ 176/* Disable with kernel boot option. */
188static bool use_selfballooning = true; 177static bool use_selfballooning = true;
189 178