Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71171
b: refs/heads/master
c: dedf8b7
h: refs/heads/master
i:
  71169: 052fa08
  71167: f069433
v: v3
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Oct 18, 2007
1 parent 526e353 commit 3fe3575
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 6ae965cd647d84ab787225fe908cb5bbbc499605
refs/heads/master: dedf8b79ec06e91fa87f6cba99e6e61b4140ceca
12 changes: 6 additions & 6 deletions trunk/kernel/cpuset.c
Original file line number Diff line number Diff line change
Expand Up @@ -2431,12 +2431,12 @@ int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
node = zone_to_nid(z);
if (node_isset(node, current->mems_allowed))
return 1;
/*
* Allow tasks that have access to memory reserves because they have
* been OOM killed to get memory anywhere.
*/
if (unlikely(test_thread_flag(TIF_MEMDIE)))
return 1;
/*
* Allow tasks that have access to memory reserves because they have
* been OOM killed to get memory anywhere.
*/
if (unlikely(test_thread_flag(TIF_MEMDIE)))
return 1;
return 0;
}

Expand Down

0 comments on commit 3fe3575

Please sign in to comment.