diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 01:34:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 01:34:02 +0300 |
| commit | 0892d742132e09e132a501d3f54428f8ffd4b2b5 (patch) | |
| tree | 19b1bbaee2e77728dfd9a19f69db2a9d8141094f /include/linux | |
| parent | 3f020399e4f1c690ce87b4c472f75b1fc89e07d5 (diff) | |
| parent | 408eb7417a92c5354c7be34f7425b305dfe30ad9 (diff) | |
| download | linux-0892d742132e09e132a501d3f54428f8ffd4b2b5.tar.xz | |
Merge tag 'x86-splitlock-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 splitlock updates from Ingo Molnar:
- Move Split and Bus lock code to a dedicated file (Ravi Bangoria)
- Add split/bus lock support for AMD (Ravi Bangoria)
* tag 'x86-splitlock-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/bus_lock: Add support for AMD
x86/split_lock: Move Split and Bus lock code to a dedicated file
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 1d5cc3e50884..5a2cdd9d8b10 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1001,7 +1001,7 @@ struct task_struct { #ifdef CONFIG_ARCH_HAS_CPU_PASID unsigned pasid_activated:1; #endif -#ifdef CONFIG_CPU_SUP_INTEL +#ifdef CONFIG_X86_BUS_LOCK_DETECT unsigned reported_split_lock:1; #endif #ifdef CONFIG_TASK_DELAY_ACCT |