From 0ddba94e49ce82c4e455703cb9bdf78b70ee83a1 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Sat, 16 Jun 2007 10:15:57 -0700
Subject: [PATCH] --- yaml --- r: 57834 b: refs/heads/master c:
 dd08c40e3e23f868eb0e49f638eb208736ec7e66 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cc027723ab96..df111489a278 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54c6ed7562d59ab238df1ec9ff76d81d7d0f0842
+refs/heads/master: dd08c40e3e23f868eb0e49f638eb208736ec7e66
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index c9ab68881b43..2a1338c516fc 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2867,7 +2867,7 @@ static int alloc_loc_track(struct loc_track *t, unsigned long max)
 
 	order = get_order(sizeof(struct location) * max);
 
-	l = (void *)__get_free_pages(GFP_KERNEL, order);
+	l = (void *)__get_free_pages(GFP_ATOMIC, order);
 
 	if (!l)
 		return 0;