diff options
| author | Paul E. McKenney <paulmck@kernel.org> | 2022-07-22 03:46:18 +0300 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2022-07-22 03:46:18 +0300 |
| commit | 34bc7b454dc31f75a0be7ee8ab378135523d7c51 (patch) | |
| tree | a1891ee085290746b6835e5e33e3c31cec2489fa /arch/x86 | |
| parent | d38c8fe48354af9c7120291938574e1ebb221d52 (diff) | |
| parent | 1dcaa3b462265f688613163a1562a65ee53a3311 (diff) | |
| download | linux-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.xz | |
Merge branch 'ctxt.2022.07.05a' into HEAD
ctxt.2022.07.05a: Linux-kernel memory model development branch.
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 4 | ||||
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index be0b95e51df6..b0a6dbbb760b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -186,8 +186,8 @@ config X86 select HAVE_ASM_MODVERSIONS select HAVE_CMPXCHG_DOUBLE select HAVE_CMPXCHG_LOCAL - select HAVE_CONTEXT_TRACKING if X86_64 - select HAVE_CONTEXT_TRACKING_OFFSTACK if HAVE_CONTEXT_TRACKING + select HAVE_CONTEXT_TRACKING_USER if X86_64 + select HAVE_CONTEXT_TRACKING_USER_OFFSTACK if HAVE_CONTEXT_TRACKING_USER select HAVE_C_RECORDMCOUNT select HAVE_OBJTOOL_MCOUNT if HAVE_OBJTOOL select HAVE_BUILDTIME_MCOUNT_SORT diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fad8faa29d04..971977c438fc 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1526,7 +1526,7 @@ DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault) /* * Entry handling for valid #PF from kernel mode is slightly - * different: RCU is already watching and rcu_irq_enter() must not + * different: RCU is already watching and ct_irq_enter() must not * be invoked because a kernel fault on a user space address might * sleep. * |