diff options
author | Wang Long <long.wanglong@huawei.com> | 2015-06-25 18:03:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 20:00:42 -0400 |
commit | bffacb9132a306b7e22bb6366e5b277f20f67465 (patch) | |
tree | 95e2df44be90a585d15ce29b99926851df22a845 /mm/kasan | |
parent | 35a4c902f61fc262aba03d5e8381334683e4d4aa (diff) |
kasan: remove duplicate definition of the macro KASAN_FREE_PAGE
Remove duplicate definition of the macro KASAN_FREE_PAGE in
mm/kasan/kasan.h
Signed-off-by: Wang Long <long.wanglong@huawei.com>
Acked-by: Andrey Ryabinin <a.ryabinin@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/kasan')
-rw-r--r-- | mm/kasan/kasan.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 4986b0acab21..c242adf6bc85 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h | |||
@@ -7,7 +7,6 @@ | |||
7 | #define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE_SIZE - 1) | 7 | #define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE_SIZE - 1) |
8 | 8 | ||
9 | #define KASAN_FREE_PAGE 0xFF /* page was freed */ | 9 | #define KASAN_FREE_PAGE 0xFF /* page was freed */ |
10 | #define KASAN_FREE_PAGE 0xFF /* page was freed */ | ||
11 | #define KASAN_PAGE_REDZONE 0xFE /* redzone for kmalloc_large allocations */ | 10 | #define KASAN_PAGE_REDZONE 0xFE /* redzone for kmalloc_large allocations */ |
12 | #define KASAN_KMALLOC_REDZONE 0xFC /* redzone inside slub object */ | 11 | #define KASAN_KMALLOC_REDZONE 0xFC /* redzone inside slub object */ |
13 | #define KASAN_KMALLOC_FREE 0xFB /* object was freed (kmem_cache_free/kfree) */ | 12 | #define KASAN_KMALLOC_FREE 0xFB /* object was freed (kmem_cache_free/kfree) */ |