diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-11-08 10:29:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-11-08 10:29:22 -0800 |
| commit | 11b6438b9e9f30e2eead2f232a58ef3f71a206be (patch) | |
| tree | 1b02298ca39941ae69468b300e884fe10637a598 /include/linux | |
| parent | 2ebb9de23bbd942b1a2431384e4a62908c31bb2a (diff) | |
| parent | 5cdc3746fa163fb4e8d05fa3cabf46bc6aa7df75 (diff) | |
Merge tag 'x86-urgent-2026-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
- Select the BHI mitigation based on the attack vector properly
(Breno Leitao)
- Fix i386-gcov build bug in csum_ipv6_magic() due to overly
strict asm constraints that cannot be met in that build mode
(Rosen Penev)
- Fix Vmware-guest i386 high-bandwidth hypercall arguments
under UNWINDER_GUESS & disabled frame-pointers (Zack Rusin)
- Fix resctrl AMD ABMC counter ID field width (Babu Moger)
- Fix restctrl pqos tool ABI breakage by reverting the
mbm_assign_mode to default mode at boot (Babu Moger)
- Initialize wall clock in get_rtc_noop() (Naman Jain)
- Fix ptrace historic ABI quirk regression (Thomas Gleixner)
- Add Drew Fustini as resctrl reviewer and Ben Horgan
as fs/resctrl reviewer
- Clear SEV RMPOPT when segmented RMP is disabled by firmware but
is advertised as available (Ashish Kalra)
- Set up SEV RMPOPT only on an active SNP host (Ashish Kalra)
- Don't emit KCFI_REFERENCE() in modules (Ridge Lomont)
- Ignore negative NMI handler durations (Breno Leitao)
- Fix off-by-one error in boot-time sme_clear_pgd() (Thorsten Blum)
- Fix ASID allocation bug (Chris Mason)
* tag 'x86-urgent-2026-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Fix global ASID handed out to two processes
x86/boot: Fix off-by-one error in sme_clear_pgd()
MAINTAINERS: Add Ben Horgan as fs/resctrl reviewer
x86/nmi: Ignore negative NMI handler durations
x86/kcfi: Don't emit KCFI_REFERENCE() in modules
x86/sev: Set up RMPOPT only on an active SNP host
x86/sev: Clear RMPOPT when segmented RMP is disabled by firmware
MAINTAINERS: resctrl: Add myself as reviewer
x86/entry: Fix ptrace regression
x86/init: Initialize wall clock in get_rtc_noop()
x86,fs/resctrl: Keep mbm_assign_mode in default mode at boot
x86/resctrl: Correct ABMC counter ID field width
x86/vmware: Fix i386 high-bandwidth hypercall arguments
x86/csum: Relax the len and proto constraints in 32-bit csum_ipv6_magic()
x86/bugs: Select the BHI mitigation based on the attack vector properly
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 0ea7150dba7b..ea161a72d1c7 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -258,10 +258,13 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, #endif /* __KERNEL__ */ -#if defined(CONFIG_CFI) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) +#if defined(CONFIG_CFI) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) && \ + !defined(MODULE) /* * Force a reference to the external symbol so the compiler generates - * __kcfi_typid. + * __kcfi_typid. Only vmlinux needs it, as that is where the assembly + * using the typeid lives; in a module it would only add a reference to + * the symbol, which fails modpost if the symbol is GPL-only. */ #define KCFI_REFERENCE(sym) __ADDRESSABLE(sym) #else |
