Commit a3209bb9 authored by Christophe Leroy (CS GROUP)'s avatar Christophe Leroy (CS GROUP) Committed by Johannes Berg
Browse files

um: Disable KASAN_INLINE when STATIC_LINK is selected 



um doesn't support KASAN_INLINE together with STATIC_LINK.

Instead of failing the build, disable KASAN_INLINE when
STATIC_LINK is selected.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202511290451.x9GZVJ1l-lkp@intel.com/


Fixes: 1e338f4d ("kasan: introduce ARCH_DEFER_KASAN and unify static key across modes")
Signed-off-by: default avatarChristophe Leroy (CS GROUP) <chleroy@kernel.org>
Link: https://patch.msgid.link/2620ab0bbba640b6237c50b9c0dca1c7d1142f5d.1764410067.git.chleroy@kernel.org


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a74b6c0e

arch/um/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ menu "UML-specific options" 
config UML

	bool

	default y

	select ARCH_DISABLE_KASAN_INLINE if STATIC_LINK

	select ARCH_NEEDS_DEFER_KASAN if STATIC_LINK

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

	select ARCH_HAS_CACHE_LINE_SIZE

arch/um/include/asm/kasan.h

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ 


#ifdef CONFIG_KASAN

void kasan_init(void);



#if defined(CONFIG_STATIC_LINK) && defined(CONFIG_KASAN_INLINE)

#error UML does not work in KASAN_INLINE mode with STATIC_LINK enabled!

#endif

#else

static inline void kasan_init(void) { }

#endif /* CONFIG_KASAN */