---

yaml --- r: 95289 b: refs/heads/master c: 30327ac h: refs/heads/master i: 95287: 11d237e v: v3
git-mirror · Apr 30, 2008 · 82aaffe · 82aaffe
1 parent 7f0f5ed
commit 82aaffe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 145980a0b07520f0f82cc40999acc92b349ea40c
+refs/heads/master: 30327acf7846c5eb97c8e31c78317a2918d3e515
diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h
@@ -29,6 +29,13 @@
 #define SLAB_MEM_SPREAD		0x00100000UL	/* Spread some memory over cpuset */
 #define SLAB_TRACE		0x00200000UL	/* Trace allocations and frees */
 
+/* Flag to prevent checks on free */
+#ifdef CONFIG_DEBUG_OBJECTS
+# define SLAB_DEBUG_OBJECTS	0x00400000UL
+#else
+# define SLAB_DEBUG_OBJECTS	0x00000000UL
+#endif
+
 /* The following flags affect the page allocator grouping pages by mobility */
 #define SLAB_RECLAIM_ACCOUNT	0x00020000UL		/* Objects are reclaimable */
 #define SLAB_TEMPORARY		SLAB_RECLAIM_ACCOUNT	/* Objects are short-lived */