From 82aaffe96f2540a7da93392b49009c89d4177095 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Apr 2008 00:54:59 -0700 Subject: [PATCH] --- yaml --- r: 95289 b: refs/heads/master c: 30327acf7846c5eb97c8e31c78317a2918d3e515 h: refs/heads/master i: 95287: 11d237ea0948c4d235fa311b2f13871e0407b28b v: v3 --- [refs] | 2 +- trunk/include/linux/slab.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b7af70f7dcbc..a68d7da46d24 100644 --- 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 index f62caaad94e0..6d03c954f641 100644 --- 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 */