From 68bb31181b2f27b7d7c21ab3e873f5000dd7ec46 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Tue, 10 Jan 2012 15:07:32 -0800
Subject: [PATCH] --- yaml --- r: 283005 b: refs/heads/master c:
 fc8d8620d39dbbaf412b1b9247d77d196d92adb9 h: refs/heads/master i:   283003:
 60206a0831e6133b2373279c27ea7f1b2a07d261 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aa3f0dcf6c30..8d42b6c13939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6968e73b90c2a2fb9a32d4bad249f8f70f70125
+refs/heads/master: fc8d8620d39dbbaf412b1b9247d77d196d92adb9
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 025f6ac51569..d99acbf14e01 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3654,6 +3654,9 @@ void __init kmem_cache_init(void)
 	struct kmem_cache *temp_kmem_cache_node;
 	unsigned long kmalloc_size;
 
+	if (debug_guardpage_minorder())
+		slub_max_order = 0;
+
 	kmem_size = offsetof(struct kmem_cache, node) +
 				nr_node_ids * sizeof(struct kmem_cache_node *);