diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-04-02 15:03:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-04-02 15:04:09 +0200 |
| commit | 9853914c08e00d2ccbffbceaaada5ad7c6e4db4c (patch) | |
| tree | 2e01e853871112c32a9cc446479459f1ecb9948d /include/linux/srcutiny.h | |
| parent | 265439eb88fda0bf77821e10aafed22cdd450f9d (diff) | |
| parent | e08d007f9d813616ce7093600bc4fdb9c9d81d89 (diff) | |
| download | lwn-9853914c08e00d2ccbffbceaaada5ad7c6e4db4c.tar.gz lwn-9853914c08e00d2ccbffbceaaada5ad7c6e4db4c.zip | |
Merge branch 'sched/urgent' into sched/core, to resolve conflicts
The following fix in sched/urgent:
e08d007f9d81 ("sched/debug: Fix avg_vruntime() usage")
is in conflict with this pending commit in sched/core:
4823725d9d1d ("sched/fair: Increase weight bits for avg_vruntime")
Both modify the same variable definition and initialization blocks,
resolve it by merging the two.
Conflicts:
kernel/sched/debug.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/srcutiny.h')
| -rw-r--r-- | include/linux/srcutiny.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/srcutiny.h b/include/linux/srcutiny.h index dec7cbe015aa..905b629e8fa3 100644 --- a/include/linux/srcutiny.h +++ b/include/linux/srcutiny.h @@ -11,6 +11,7 @@ #ifndef _LINUX_SRCU_TINY_H #define _LINUX_SRCU_TINY_H +#include <linux/irq_work_types.h> #include <linux/swait.h> struct srcu_struct { @@ -24,18 +25,21 @@ struct srcu_struct { struct rcu_head *srcu_cb_head; /* Pending callbacks: Head. */ struct rcu_head **srcu_cb_tail; /* Pending callbacks: Tail. */ struct work_struct srcu_work; /* For driving grace periods. */ + struct irq_work srcu_irq_work; /* Defer schedule_work() to irq work. */ #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lockdep_map dep_map; #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */ }; void srcu_drive_gp(struct work_struct *wp); +void srcu_tiny_irq_work(struct irq_work *irq_work); #define __SRCU_STRUCT_INIT(name, __ignored, ___ignored, ____ignored) \ { \ .srcu_wq = __SWAIT_QUEUE_HEAD_INITIALIZER(name.srcu_wq), \ .srcu_cb_tail = &name.srcu_cb_head, \ .srcu_work = __WORK_INITIALIZER(name.srcu_work, srcu_drive_gp), \ + .srcu_irq_work = { .func = srcu_tiny_irq_work }, \ __SRCU_DEP_MAP_INIT(name) \ } |