summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrey Konovalov <andreyknvl@google.com>2020-12-22 12:01:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-22 12:55:07 -0800
commit60a3a5fe950f4e6c02e9fc6676dc96de043ed743 (patch)
tree6500ce8a59c1def2ae6583d82d9a2fbaaea9b11b /include
parent28ab35841ce0262b41074464d9fb6709bb26348f (diff)
downloadlinux-stable-60a3a5fe950f4e6c02e9fc6676dc96de043ed743.tar.gz
linux-stable-60a3a5fe950f4e6c02e9fc6676dc96de043ed743.tar.bz2
linux-stable-60a3a5fe950f4e6c02e9fc6676dc96de043ed743.zip
kasan, arm64: rename kasan_init_tags and mark as __init
Rename kasan_init_tags() to kasan_init_sw_tags() as the upcoming hardware tag-based KASAN mode will have its own initialization routine. Also similarly to kasan_init() mark kasan_init_tags() as __init. Link: https://lkml.kernel.org/r/71e52af72a09f4b50c8042f16101c60e50649fbb.1606161801.git.andreyknvl@google.com Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: Alexander Potapenko <glider@google.com> Tested-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Branislav Rankov <Branislav.Rankov@arm.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Evgenii Stepanov <eugenis@google.com> Cc: Kevin Brodsky <kevin.brodsky@arm.com> Cc: Marco Elver <elver@google.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kasan.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index b272960e8396..d7042d129dc1 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -192,7 +192,7 @@ static inline void kasan_record_aux_stack(void *ptr) {}
#ifdef CONFIG_KASAN_SW_TAGS
-void kasan_init_tags(void);
+void __init kasan_init_sw_tags(void);
void *kasan_reset_tag(const void *addr);
@@ -201,7 +201,7 @@ bool kasan_report(unsigned long addr, size_t size,
#else /* CONFIG_KASAN_SW_TAGS */
-static inline void kasan_init_tags(void) { }
+static inline void kasan_init_sw_tags(void) { }
static inline void *kasan_reset_tag(const void *addr)
{