Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42665
b: refs/heads/master
c: b43a57b
h: refs/heads/master
i:
  42663: 240a2c4
v: v3
  • Loading branch information
Kirill Korotaev authored and Linus Torvalds committed Dec 7, 2006
1 parent a705e4c commit 74e3fac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: a3eea484f7a1aadb70ed6665338026a09ad6ce85
refs/heads/master: b43a57bb4dae72e8f7232e7c821a8799eda30022
2 changes: 1 addition & 1 deletion trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,

/* This allocation should allow future memory freeing. */

rebalance:
if (((p->flags & PF_MEMALLOC) || unlikely(test_thread_flag(TIF_MEMDIE)))
&& !in_interrupt()) {
if (!(gfp_mask & __GFP_NOMEMALLOC)) {
Expand All @@ -1201,7 +1202,6 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
if (!wait)
goto nopage;

rebalance:
cond_resched();

/* We now go into synchronous reclaim */
Expand Down

0 comments on commit 74e3fac

Please sign in to comment.