Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164366
b: refs/heads/master
c: 478b81f
h: refs/heads/master
v: v3
  • Loading branch information
David Rientjes authored and Linus Torvalds committed Sep 22, 2009
1 parent 01afab4 commit 42de9f0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5abeeacc44bbef2935a7a8e939264c28962def2
refs/heads/master: 478b81fd84a299adb401dbbae296f3767e552999
4 changes: 0 additions & 4 deletions trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1627,10 +1627,6 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,

/* We now go into synchronous reclaim */
cpuset_memory_pressure_bump();

/*
* The task's cpuset might have expanded its set of allowable nodes
*/
p->flags |= PF_MEMALLOC;
lockdep_set_current_reclaim_state(gfp_mask);
reclaim_state.reclaimed_slab = 0;
Expand Down

0 comments on commit 42de9f0

Please sign in to comment.