diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-03-31 18:15:09 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-03-31 18:15:09 +0300 |
| commit | 85b475a4502d45380c1b9223c01954daa228eeb0 (patch) | |
| tree | 2f37f9ea8519f7a101decd8a1e9ec13db051363b /arch/powerpc/include/asm/kasan.h | |
| parent | 80962ec912db56d323883154efc2297473e692cb (diff) | |
| parent | 21f27df854008b86349a203bf97fef79bb11f53e (diff) | |
| download | linux-85b475a4502d45380c1b9223c01954daa228eeb0.tar.xz | |
Merge tag 'kvm-s390-master-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A small fix that repairs the external loop detection code for PV
guests.
Diffstat (limited to 'arch/powerpc/include/asm/kasan.h')
| -rw-r--r-- | arch/powerpc/include/asm/kasan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h index 92a968202ba7..365d2720097c 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -2,7 +2,7 @@ #ifndef __ASM_KASAN_H #define __ASM_KASAN_H -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN) && !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX) #define _GLOBAL_KASAN(fn) _GLOBAL(__##fn) #define _GLOBAL_TOC_KASAN(fn) _GLOBAL_TOC(__##fn) #define EXPORT_SYMBOL_KASAN(fn) EXPORT_SYMBOL(__##fn) |