[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH 8/8] xen/tmem: Remove the usage of 'noselfballoon', 'selfballoon' and use 'tmem.selfballon' 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@xxxxxxxxxx>
 drivers/xen/Kconfig           |  5 ++---
 drivers/xen/xen-selfballoon.c | 21 ---------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index b0337a6..221b3a6 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -19,11 +19,10 @@ config XEN_SELFBALLOONING
          by the current usage of anonymous memory ("committed AS") and
          controlled by various sysfs-settable parameters.  Configuring
          FRONTSWAP is highly recommended; if it is not configured, self-
-         ballooning is disabled by default but can be enabled with the
-         'selfballooning' kernel boot parameter.  If FRONTSWAP is configured,
+         ballooning is disabled by default. If FRONTSWAP is configured,
          frontswap-selfshrinking is enabled by default but can be disabled
          with the 'tmem.selfshrink=0' kernel boot parameter; and 
-         is enabled by default but can be disabled with the 'noselfballooning'
+         is enabled by default but can be disabled with the 
          kernel boot parameter.  Note that systems without a sufficiently
          large swap device should not enable self-ballooning.
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c
index 012f9d9..ee49367 100644
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@ -173,27 +173,6 @@ static void frontswap_selfshrink(void)
-/* Disable with kernel boot option. */
-static bool use_selfballooning = true;
-static int __init xen_noselfballooning_setup(char *s)
-       use_selfballooning = false;
-       return 1;
-__setup("noselfballooning", xen_noselfballooning_setup);
-#else /* !CONFIG_FRONTSWAP */
-/* Enable with kernel boot option. */
-static bool use_selfballooning;
-static int __init xen_selfballooning_setup(char *s)
-       use_selfballooning = true;
-       return 1;
-__setup("selfballooning", xen_selfballooning_setup);
 #endif /* CONFIG_FRONTSWAP */
 #define MB2PAGES(mb)   ((mb) << (20 - PAGE_SHIFT))

Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.