diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-08 10:01:44 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-08 10:01:44 +1000 |
| commit | 9bc9a36010df5bfb252c477473bd100cb8b1aa1e (patch) | |
| tree | 83afa393a8e08435954034e0bff4d2e53cf377f7 /include | |
| parent | 3f5c5342bc872d582e148ed7e7c0667848385a16 (diff) | |
| parent | f6faec30406fdec5bfb388faa4afd9b6bb39c366 (diff) | |
Merge remote-tracking branch 'device-mapper/for-next'
Diffstat (limited to 'include')
| -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 7e37d448ed91..8a99115cf6da 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -87,6 +87,8 @@ # define SLAB_FAILSLAB 0x00000000UL #endif +#define SLAB_NO_MERGE 0x04000000UL /* Do not merge with existing slab */ + /* 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 */ |