diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 17:10:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 17:10:18 +1100 |
| commit | ffc197f4e0020769405e44a7998ca0ae2a6da03b (patch) | |
| tree | be3760e7d6a3db4794b24c13eb7edb0c582f7f6c /include/linux/slab.h | |
| parent | 6de71cd23bd8228deb38ec5d6a55c9fa5cacdd74 (diff) | |
| parent | a2a127e219d3eeca56232bad1f7e8681a10e609e (diff) | |
Merge commit 'kmemleak/kmemleak'
Conflicts:
include/linux/slab.h
init/main.c
lib/Kconfig.debug
mm/slab.c
mm/slob.c
mm/slub.c
Diffstat (limited to 'include/linux/slab.h')
| -rw-r--r-- | include/linux/slab.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index ff039de7113c..377f0dcf5bf4 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -69,6 +69,8 @@ # define SLAB_NOTRACK 0x00000000UL #endif +#define SLAB_NOLEAKTRACE 0x01000000UL /* Avoid kmemleak tracing */ + /* 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 */ |