summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Ryabinin <aryabinin@virtuozzo.com>2016-05-26 15:16:11 -0700
committerPaul Lawrence <paullawrence@google.com>2017-12-14 08:21:02 -0800
commit30d8b5b40294f132eba25efed83b66f02df6ca3c (patch)
tree70c72b6c005a942a45b8b93644355f995cf03ccc
parent101a6c23d8ecdfdd5d44433d6d957912625df408 (diff)
UPSTREAM: mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
Commit cd11016e5f52 ("mm, kasan: stackdepot implementation. Enable stackdepot for SLAB") added 'reserved' field, but never used it. Link: http://lkml.kernel.org/r/1464021054-2307-1-git-send-email-aryabinin@virtuozzo.com Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Alexander Potapenko <glider@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Bug: 64145065 (cherry-picked from 9725759a96efb1ce56a1b93455ac0ab1901c5327) Change-Id: I34d5d28a6f6e1014d234f38c23b6e4aa408d3e84 Signed-off-by: Paul Lawrence <paullawrence@google.com>
-rw-r--r--mm/kasan/kasan.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index a7359f3e69e9..bd1ddd8e5474 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -80,7 +80,6 @@ struct kasan_alloc_meta {
struct kasan_track track;
u32 state : 2; /* enum kasan_state */
u32 alloc_size : 30;
- u32 reserved;
};
struct qlist_node {