diff options
| author | Tejun Heo <tj@kernel.org> | 2025-02-08 20:34:43 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-02-08 20:34:43 -1000 |
| commit | 29ef4a2fcf48a458af2ede543f5755fa95b175a5 (patch) | |
| tree | 08cc8798a8eb9e364be31d02e8379c876b4aecc4 /tools/sched_ext | |
| parent | 38d65cd692a26e09152bcec67d641a7914a5cba6 (diff) | |
| parent | 32966821574cd2917bd60f2554f435fe527f4702 (diff) | |
Merge branch 'for-6.14-fixes' into for-6.15
Pull to receive:
- 2fa0fbeb69ed ("sched_ext: Implement auto local dispatching of migration disabled tasks")
- 32966821574c ("sched_ext: Fix migration disabled handling in targeted dispatches")
as planned for-6.15 changes depend on them (e.g. adding event counter for
implicit migration disabled task handling).
Diffstat (limited to 'tools/sched_ext')
| -rw-r--r-- | tools/sched_ext/include/scx/common.bpf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/sched_ext/include/scx/common.bpf.h b/tools/sched_ext/include/scx/common.bpf.h index 705540003024..ae717f4d6ede 100644 --- a/tools/sched_ext/include/scx/common.bpf.h +++ b/tools/sched_ext/include/scx/common.bpf.h @@ -436,7 +436,7 @@ void bpf_rcu_read_unlock(void) __ksym; */ static inline s64 time_delta(u64 after, u64 before) { - return (s64)(after - before) > 0 ? : 0; + return (s64)(after - before) > 0 ? (s64)(after - before) : 0; } /** |