summaryrefslogtreecommitdiffstats
path: root/mm/swap.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 09:00:06 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 09:00:06 +0200
commit4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch)
treeb3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /mm/swap.c
parentpowerpc: Remove unused/obsolete CONFIG_XICS (diff)
parentpowerpc/4xx: Fix regression in SMP on 476 (diff)
downloadlinux-4c8440666b995f20604852b35dcfdbcc1d5931f1.tar.xz
linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.zip
Merge branch 'merge' into next
Diffstat (limited to 'mm/swap.c')
-rw-r--r--mm/swap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/swap.c b/mm/swap.c
index a448db377cb0..5602f1a1b1e7 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -396,6 +396,9 @@ static void lru_deactivate_fn(struct page *page, void *arg)
if (!PageLRU(page))
return;
+ if (PageUnevictable(page))
+ return;
+
/* Some processes are using the page */
if (page_mapped(page))
return;