From: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Add 'defined(__SANITIZE_ADDRESS__)' to check to determine whether __no_kasan_or_inline should be 'no_kasan' or 'inline'. Files that compile with KASAN disabled may not link to KASAN, in which case the __maybe_unused attribute added in the 'no_kasan' option can cause linker errors due to unused functions that manually invoke KASAN functions, e.g. read_word_at_a_time(), not being discarded. Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> --- include/linux/compiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index ab4711c63601..e7a863a3ac8c 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -188,7 +188,7 @@ void __read_once_size(const volatile void *p, void *res, int size) __READ_ONCE_SIZE; } -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN) && defined(__SANITIZE_ADDRESS__) /* * We can't declare function 'inline' because __no_sanitize_address confilcts * with inlining. Attempt to inline it may cause a build failure. -- 2.17.0
