diff options
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/tmem.c | 8 | ||||
| -rw-r--r-- | drivers/xen/xen-selfballoon.c | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c index c1df0ff89878..18e8bd8fa947 100644 --- a/drivers/xen/tmem.c +++ b/drivers/xen/tmem.c | |||
| @@ -403,6 +403,14 @@ static int xen_tmem_init(void) | |||
| 403 | } | 403 | } |
| 404 | #endif | 404 | #endif |
| 405 | #ifdef CONFIG_XEN_SELFBALLOONING | 405 | #ifdef CONFIG_XEN_SELFBALLOONING |
| 406 | /* | ||
| 407 | * There is no point of driving pages to the swap system if they | ||
| 408 | * aren't going anywhere in tmem universe. | ||
| 409 | */ | ||
| 410 | if (!frontswap) { | ||
| 411 | selfshrinking = false; | ||
| 412 | selfballooning = false; | ||
| 413 | } | ||
| 406 | xen_selfballoon_init(selfballooning, selfshrinking); | 414 | xen_selfballoon_init(selfballooning, selfshrinking); |
| 407 | #endif | 415 | #endif |
| 408 | return 0; | 416 | return 0; |
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c index 5d637e2b1b9f..f70984a892aa 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c | |||
| @@ -53,15 +53,12 @@ | |||
| 53 | * System configuration note: Selfballooning should not be enabled on | 53 | * System configuration note: Selfballooning should not be enabled on |
| 54 | * systems without a sufficiently large swap device configured; for best | 54 | * systems without a sufficiently large swap device configured; for best |
| 55 | * results, it is recommended that total swap be increased by the size | 55 | * results, it is recommended that total swap be increased by the size |
| 56 | * of the guest memory. Also, while technically not required to be | 56 | * of the guest memory. Note, that selfballooning should be disabled by default |
| 57 | * configured, it is highly recommended that frontswap also be configured | 57 | * if frontswap is not configured. Similarly selfballooning should be enabled |
| 58 | * and enabled when selfballooning is running. So, selfballooning | 58 | * by default if frontswap is configured and can be disabled with the |
| 59 | * is disabled by default if frontswap is not configured and can only | 59 | * "tmem.selfballooning=0" kernel boot option. Finally, when frontswap is |
| 60 | * be enabled with the "tmem.selfballooning=1" kernel boot option; similarly | 60 | * configured, frontswap-selfshrinking can be disabled with the |
| 61 | * selfballooning is enabled by default if frontswap is configured and | 61 | * "tmem.selfshrink=0" kernel boot option. |
| 62 | * can be disabled with the "tmem.selfballooning=0" kernel boot option. Finally, | ||
| 63 | * when frontswap is configured,frontswap-selfshrinking can be disabled | ||
| 64 | * with the "tmem.selfshrink=0" kernel boot option. | ||
| 65 | * | 62 | * |
| 66 | * Selfballooning is disallowed in domain0 and force-disabled. | 63 | * Selfballooning is disallowed in domain0 and force-disabled. |
| 67 | * | 64 | * |