Merge branch 'linus' into release

[firefly-linux-kernel-4.4.55.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index a5789b91d17962c9856729f1c6844fb4739c0f0e..0a216aae227e8b3ca7daa5ab8140a2a804784181 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1071,6 +1071,8 @@ static inline unsigned long kmem_cache_flags(unsigned long objsize,
 }
 #define slub_debug 0
 
+#define disable_higher_order_debug 0
+
 static inline unsigned long slabs_node(struct kmem_cache *s, int node)
                                                        { return 0; }
 static inline unsigned long node_nr_slabs(struct kmem_cache_node *n)