From c68dea2cd28ae2da1862d65f5445d2fadafbb2a0 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Wed, 11 Nov 2009 14:26:17 -0800
Subject: [PATCH] --- yaml --- r: 168565 b: refs/heads/master c:
 9d0ed60fe9cd1fbf57f755cd27a23ae9114d7210 h: refs/heads/master i:   168563:
 b85603e25630396846f6ebea3c04e34527611707 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 989f3ef39e33..48e15624e0ed 100644
--- 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
index 250d0552a92d..2bc2ac63f41e 100644
--- 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))) {