Merge tag 'x86-urgent-2025-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 bug fix from Thomas Gleixner:
"A single fix for a GCC wreckage, which emits a KCSAN instrumentation
call in __sev_es_nmi_complete() despite the function being annotated
with 'noinstr'.

As all functions in that source file are noinstr, exclude the whole
file from KCSAN in the Makefile to cure it"

* tag 'x86-urgent-2025-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/sev: Work around broken noinstr on GCC

Changed files
+2 -1
arch
x86
coco
sev
+2 -1
arch/x86/coco/sev/Makefile
··· 5 5 # Clang 14 and older may fail to respect __no_sanitize_undefined when inlining 6 6 UBSAN_SANITIZE_sev-nmi.o := n 7 7 8 - # GCC may fail to respect __no_sanitize_address when inlining 8 + # GCC may fail to respect __no_sanitize_address or __no_kcsan when inlining 9 9 KASAN_SANITIZE_sev-nmi.o := n 10 + KCSAN_SANITIZE_sev-nmi.o := n