diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-07-19 09:43:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-07-19 09:43:25 +0200 |
| commit | 752182b24bf4ffda1c5a8025515d53122d930bd8 (patch) | |
| tree | 836031bb239fa1f2288e7ad089b030abea6a4838 /kernel/cgroup | |
| parent | 48b5583719cdfbdee238f9549a6a1a47af2b0469 (diff) | |
| parent | fdf0eaf11452d72945af31804e2a1048ee1b574c (diff) | |
| download | linux-752182b24bf4ffda1c5a8025515d53122d930bd8.tar.gz | |
Merge tag 'v6.5-rc2' into sched/core, to pick up fixes
Sync with upstream fixes before applying EEVDF.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/cgroup')
| -rw-r--r-- | kernel/cgroup/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 4e3ee13217ce7..5fa95f86cb4dd 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -3760,7 +3760,7 @@ static ssize_t pressure_write(struct kernfs_open_file *of, char *buf, } psi = cgroup_psi(cgrp); - new = psi_trigger_create(psi, buf, res, of->file); + new = psi_trigger_create(psi, buf, res, of->file, of); if (IS_ERR(new)) { cgroup_put(cgrp); return PTR_ERR(new); |