diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2023-04-21 13:24:18 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-04-21 13:24:18 +0200 |
| commit | 5a4d3b38ed0cd5bbb03eccea6d9949136abc45c3 (patch) | |
| tree | 1e653da8837c52ed1d24126974a0d7dbbdf34e02 /include/linux/context_tracking_state.h | |
| parent | 9b8e17813aeccc29c2f9f2e6e68997a6eac2d26d (diff) | |
| parent | 6a8f57ae2eb07ab39a6f0ccad60c760743051026 (diff) | |
Merge branch 'v6.3-rc7'
Sync with the urgent patches; in particular:
a53ce18cacb4 ("sched/fair: Sanitize vruntime of entity being migrated")
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'include/linux/context_tracking_state.h')
| -rw-r--r-- | include/linux/context_tracking_state.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h index 4a4d56f77180..fdd537ea513f 100644 --- a/include/linux/context_tracking_state.h +++ b/include/linux/context_tracking_state.h @@ -46,7 +46,9 @@ struct context_tracking { #ifdef CONFIG_CONTEXT_TRACKING DECLARE_PER_CPU(struct context_tracking, context_tracking); +#endif +#ifdef CONFIG_CONTEXT_TRACKING_USER static __always_inline int __ct_state(void) { return arch_atomic_read(this_cpu_ptr(&context_tracking.state)) & CT_STATE_MASK; |