---

yaml --- r: 168565 b: refs/heads/master c: 9d0ed60 h: refs/heads/master i: 168563: b85603e v: v3
git-mirror · Nov 12, 2009 · c68dea2 · c68dea2
1 parent 8d258f2
commit c68dea2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc4a6851466039a8a688c843962a05689059ff3b
+refs/heads/master: 9d0ed60fe9cd1fbf57f755cd27a23ae9114d7210
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1769,7 +1769,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
 		 * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
 		 */
 		alloc_flags &= ~ALLOC_CPUSET;
-	} else if (unlikely(rt_task(p)))
+	} else if (unlikely(rt_task(p)) && !in_interrupt())
 		alloc_flags |= ALLOC_HARDER;
 
 	if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) {