projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm, frontswap: convert frontswap_enabled to static key
[linux-2.6-block.git]
/
drivers
/
xen
/
xen-selfballoon.c
diff --git
a/drivers/xen/xen-selfballoon.c
b/drivers/xen/xen-selfballoon.c
index 53a085fca00c0bd32f7f022c62c00588a906140e..66620713242a1e7416d656cca5f0353c660e1133 100644
(file)
--- a/
drivers/xen/xen-selfballoon.c
+++ b/
drivers/xen/xen-selfballoon.c
@@
-195,7
+195,7
@@
static void selfballoon_process(struct work_struct *work)
MB2PAGES(selfballoon_reserved_mb);
#ifdef CONFIG_FRONTSWAP
/* allow space for frontswap pages to be repatriated */
MB2PAGES(selfballoon_reserved_mb);
#ifdef CONFIG_FRONTSWAP
/* allow space for frontswap pages to be repatriated */
- if (frontswap_selfshrinking
&& frontswap_enabled
)
+ if (frontswap_selfshrinking)
goal_pages += frontswap_curr_pages();
#endif
if (cur_pages > goal_pages)
goal_pages += frontswap_curr_pages();
#endif
if (cur_pages > goal_pages)
@@
-230,7
+230,7
@@
static void selfballoon_process(struct work_struct *work)
reset_timer = true;
}
#ifdef CONFIG_FRONTSWAP
reset_timer = true;
}
#ifdef CONFIG_FRONTSWAP
- if (frontswap_selfshrinking
&& frontswap_enabled
) {
+ if (frontswap_selfshrinking) {
frontswap_selfshrink();
reset_timer = true;
}
frontswap_selfshrink();
reset_timer = true;
}