---

yaml --- r: 283005 b: refs/heads/master c: fc8d862 h: refs/heads/master i: 283003: 60206a0 v: v3
git-mirror · Jan 11, 2012 · 68bb311 · 68bb311
1 parent bc0d779
commit 68bb311
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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 *);