diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-08 23:04:25 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 23:04:25 +0300 |
| commit | 89cda06d7f9c3c111a81fcdf5464926f5f984ebc (patch) | |
| tree | bfa46c20c325feccd9de1a293e11686981d63e7b /include/linux/vmalloc.h | |
| parent | ede8342bf63166e8d8fc3c05fc0985b27cc8186b (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | linux-89cda06d7f9c3c111a81fcdf5464926f5f984ebc.tar.xz | |
Merge tag 'v4.0-rc7' into spi-img-spfi
Linux 4.0-rc7
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 7d7acb35603d..0ec598381f97 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -17,6 +17,7 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */ #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */ #define VM_NO_GUARD 0x00000040 /* don't add guard page */ +#define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */ /* bits [20..32] reserved for arch specific ioremap internals */ /* |