The patch titled Subject: psi-pressure-stall-information-for-cpu-memory-and-io-fix-3 has been added to the -mm tree. Its filename is psi-pressure-stall-information-for-cpu-memory-and-io-fix-3.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/psi-pressure-stall-information-for-cpu-memory-and-io-fix-3.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/psi-pressure-stall-information-for-cpu-memory-and-io-fix-3.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Johannes Weiner <hannes@xxxxxxxxxxx> Subject: psi-pressure-stall-information-for-cpu-memory-and-io-fix-3 rename psi_clock() to psi_update_work(), per Peter Link: http://lkml.kernel.org/r/20180907145404.GB11088@xxxxxxxxxxx Cc: Christopher Lameter <cl@xxxxxxxxx> Cc: Daniel Drake <drake@xxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Johannes Weiner <jweiner@xxxxxx> Cc: Mike Galbraith <efault@xxxxxx> Cc: Peter Enderborg <peter.enderborg@xxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Shakeel Butt <shakeelb@xxxxxxxxxx> Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Vinayak Menon <vinmenon@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/sched/psi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/kernel/sched/psi.c~psi-pressure-stall-information-for-cpu-memory-and-io-fix-3 +++ a/kernel/sched/psi.c @@ -154,7 +154,7 @@ static struct psi_group psi_system = { .pcpu = &system_group_pcpu, }; -static void psi_clock(struct work_struct *work); +static void psi_update_work(struct work_struct *work); static void group_init(struct psi_group *group) { @@ -163,7 +163,7 @@ static void group_init(struct psi_group for_each_possible_cpu(cpu) seqcount_init(&per_cpu_ptr(group->pcpu, cpu)->seq); group->next_update = sched_clock() + psi_period; - INIT_DELAYED_WORK(&group->clock_work, psi_clock); + INIT_DELAYED_WORK(&group->clock_work, psi_update_work); mutex_init(&group->stat_lock); } @@ -354,7 +354,7 @@ out: return nonidle_total; } -static void psi_clock(struct work_struct *work) +static void psi_update_work(struct work_struct *work) { struct delayed_work *dwork; struct psi_group *group; _ Patches currently in -mm which might be from hannes@xxxxxxxxxxx are mm-workingset-tell-cache-transitions-from-workingset-thrashing.patch delayacct-track-delays-from-thrashing-cache-pages.patch sched-loadavg-consolidate-load_int-load_frac-calc_load.patch sched-loadavg-make-calc_load_n-public.patch sched-schedh-make-rq-locking-and-clock-functions-available-in-statsh.patch sched-introduce-this_rq_lock_irq.patch psi-pressure-stall-information-for-cpu-memory-and-io.patch psi-pressure-stall-information-for-cpu-memory-and-io-fix.patch psi-pressure-stall-information-for-cpu-memory-and-io-fix-2.patch psi-pressure-stall-information-for-cpu-memory-and-io-fix-3.patch psi-cgroup-support.patch