diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 17:52:04 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 17:52:04 +0200 |
| commit | 7a0287df3e83a0012dfc496d4a8af9c1c5b126ef (patch) | |
| tree | 27cc2f768de7e9014ffa899117bf219d0f20fb5e /mm/swap.c | |
| parent | arch/tile: prefer "tilepro" as the name of the 32-bit architecture (diff) | |
| parent | Linux 2.6.39 (diff) | |
| download | linux-7a0287df3e83a0012dfc496d4a8af9c1c5b126ef.tar.xz linux-7a0287df3e83a0012dfc496d4a8af9c1c5b126ef.zip | |
Merge tag 'v2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'mm/swap.c')
| -rw-r--r-- | mm/swap.c | 3 |
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; |