diff options
| author |  Paul E. McKenney <paulmck@kernel.org>
| 2022-07-21 17:46:18 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org>
| 2022-07-21 17:46:18 -0700 |
| commit | 34bc7b454dc31f75a0be7ee8ab378135523d7c51 (patch) | |
| tree | a1891ee085290746b6835e5e33e3c31cec2489fa /kernel/sched/core.c | |
| parent | Merge branches 'doc.2022.06.21a', 'fixes.2022.07.19a', 'nocb.2022.07.19a', 'p... (diff) | |
| parent | context_tracking: Use arch_atomic_read() in __ct_state for KASAN (diff) | |
| download | linux-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.gz linux-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.bz2 linux-34bc7b454dc31f75a0be7ee8ab378135523d7c51.zip | |
Merge branch 'ctxt.2022.07.05a' into HEAD
ctxt.2022.07.05a: Linux-kernel memory model development branch.
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 9568019be124..f53c0096860b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6591,7 +6591,7 @@ void __sched schedule_idle(void) } while (need_resched()); } -#if defined(CONFIG_CONTEXT_TRACKING) && !defined(CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK) +#if defined(CONFIG_CONTEXT_TRACKING_USER) && !defined(CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK) asmlinkage __visible void __sched schedule_user(void) { /* |