diff options
| author | Will Deacon <will@kernel.org> | 2021-10-29 14:25:08 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-10-29 14:25:08 +0300 |
| commit | 7066248c44ee4392b6831b2ede0ce57891202de0 (patch) | |
| tree | b043c40d932283f93e1bceeea56a1615c4b48f85 /include | |
| parent | dc6bab18fb3c9dfde892cef2b1fe73565ff1f91a (diff) | |
| parent | 2d27e585147395316289c63efc932984675c65c2 (diff) | |
| download | linux-7066248c44ee4392b6831b2ede0ce57891202de0.tar.xz | |
Merge branch 'for-next/mte' into for-next/core
* for-next/mte:
kasan: Extend KASAN mode kernel parameter
arm64: mte: Add asymmetric mode support
arm64: mte: CPU feature detection for Asymm MTE
arm64: mte: Bitfield definitions for Asymm MTE
kasan: Remove duplicate of kasan_flag_async
arm64: kasan: mte: move GCR_EL1 switch to task switch when KASAN disabled
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kasan.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/kasan.h b/include/linux/kasan.h index dd874a1ee862..de5f5913374d 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -89,7 +89,7 @@ static __always_inline bool kasan_enabled(void) return static_branch_likely(&kasan_flag_enabled); } -static inline bool kasan_has_integrated_init(void) +static inline bool kasan_hw_tags_enabled(void) { return kasan_enabled(); } @@ -104,7 +104,7 @@ static inline bool kasan_enabled(void) return IS_ENABLED(CONFIG_KASAN); } -static inline bool kasan_has_integrated_init(void) +static inline bool kasan_hw_tags_enabled(void) { return false; } @@ -125,6 +125,11 @@ static __always_inline void kasan_free_pages(struct page *page, #endif /* CONFIG_KASAN_HW_TAGS */ +static inline bool kasan_has_integrated_init(void) +{ + return kasan_hw_tags_enabled(); +} + #ifdef CONFIG_KASAN struct kasan_cache { |