diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-19 14:34:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-19 14:34:02 -0800 |
| commit | 0892d742132e09e132a501d3f54428f8ffd4b2b5 (patch) | |
| tree | 19b1bbaee2e77728dfd9a19f69db2a9d8141094f /kernel | |
| parent | 3f020399e4f1c690ce87b4c472f75b1fc89e07d5 (diff) | |
| parent | 408eb7417a92c5354c7be34f7425b305dfe30ad9 (diff) | |
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 'kernel')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index b007f9f11267..f6752b0dca97 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1185,7 +1185,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node) tsk->active_memcg = NULL; #endif -#ifdef CONFIG_CPU_SUP_INTEL +#ifdef CONFIG_X86_BUS_LOCK_DETECT tsk->reported_split_lock = 0; #endif |