Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 119193
b: refs/heads/master
c: 63eb6b9
h: refs/heads/master
i:
  119191: 3d7986b
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Nov 20, 2008
1 parent ef5b6c0 commit 41c70a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bda8550deed96687f29992d711a88ea21cff4d26
refs/heads/master: 63eb6b93ce725e4c5f38fc85dd703d49465b03cb
3 changes: 3 additions & 0 deletions trunk/mm/vmscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,8 @@ static unsigned long shrink_page_list(struct list_head *page_list,
* Try to allocate it some swap space here.
*/
if (PageAnon(page) && !PageSwapCache(page)) {
if (!(sc->gfp_mask & __GFP_IO))
goto keep_locked;
switch (try_to_munlock(page)) {
case SWAP_FAIL: /* shouldn't happen */
case SWAP_AGAIN:
Expand All @@ -634,6 +636,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
}
if (!add_to_swap(page, GFP_ATOMIC))
goto activate_locked;
may_enter_fs = 1;
}
#endif /* CONFIG_SWAP */

Expand Down

0 comments on commit 41c70a5

Please sign in to comment.