From b819eb4812a630bba62db621fb329aa019258260 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Sun, 22 Aug 2010 16:16:06 -0700
Subject: [PATCH] --- yaml --- r: 215939 b: refs/heads/master c:
 8df275af8db8220d7e3f1bf97b6ac7aad05f96f0 h: refs/heads/master i:   215937:
 af67aed28b9e63ce3657187c3c9dd46db65c53cf   215935:
 497a1c2ca90ac25373b0fe63f5ec5a0e67e6b1be v: v3

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

diff --git a/[refs] b/[refs]
index 18467a69302d..bcbeeebc9486 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1d508365ea07f9f8849c7da5b02186601570f8b
+refs/heads/master: 8df275af8db8220d7e3f1bf97b6ac7aad05f96f0
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
index d582171c8101..617b6d6c42c7 100644
--- a/trunk/mm/slob.c
+++ b/trunk/mm/slob.c
@@ -500,7 +500,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 	} else {
 		unsigned int order = get_order(size);
 
-		ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
+		if (likely(order))
+			gfp |= __GFP_COMP;
+		ret = slob_new_pages(gfp, order, node);
 		if (ret) {
 			struct page *page;
 			page = virt_to_page(ret);