projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux
[linux-2.6-block.git]
/
mm
/
slab.h
diff --git
a/mm/slab.h
b/mm/slab.h
index f33980ab0406980edc03bb4a54f6f08c5e9aaa4b..9653f2e2591ad0982d2dc74c668323a43e5b026d 100644
(file)
--- a/
mm/slab.h
+++ b/
mm/slab.h
@@
-369,6
+369,8
@@
static inline size_t slab_ksize(const struct kmem_cache *s)
if (s->flags & (SLAB_RED_ZONE | SLAB_POISON))
return s->object_size;
# endif
+ if (s->flags & SLAB_KASAN)
+ return s->object_size;
/*
* If we have the need to store the freelist pointer
* back there or track user information then we can