The patch titled
Subject: psi-pressure-stall-information-for-cpu-memory-and-io-fix-4
has been removed from the -mm tree. Its filename was
psi-pressure-stall-information-for-cpu-memory-and-io-fix-4.patch
This patch was dropped because it was folded into psi-pressure-stall-information-for-cpu-memory-and-io.patch
------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: psi-pressure-stall-information-for-cpu-memory-and-io-fix-4
Hi Randy,
Thanks for the report.
On Wed, Sep 12, 2018 at 05:45:08PM -0700, Randy Dunlap wrote:
> Multiple build errors when CONFIG_SMP is not set: (this is on i386 fwiw)
>
> in the psi (pressure) patches, I guess:
>
> In file included from ../kernel/sched/sched.h:1367:0,
> from ../kernel/sched/core.c:8:
> ../kernel/sched/stats.h: In function 'psi_task_tick':
> ../kernel/sched/stats.h:135:33: error: 'struct rq' has no member named 'cpu'
> psi_memstall_tick(rq->curr, rq->cpu);
This needs to use the SMP/UP config-aware accessor.
Link: http://lkml.kernel.org/r/20180913014222.GA2370@xxxxxxxxxxx
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/kernel/sched/stats.h~psi-pressure-stall-information-for-cpu-memory-and-io-fix-4
+++ a/kernel/sched/stats.h
@@ -132,7 +132,7 @@ static inline void psi_task_tick(struct
return;
if (unlikely(rq->curr->flags & PF_MEMSTALL))
- psi_memstall_tick(rq->curr, rq->cpu);
+ psi_memstall_tick(rq->curr, cpu_of(rq));
}
#else /* CONFIG_PSI */
static inline void psi_enqueue(struct task_struct *p, bool wakeup) {}
_
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-cgroup-support.patch
mm-workingset-use-cheaper-__inc_lruvec_state-in-irqsafe-node-reclaim.patch
mm-workingset-add-vmstat-counter-for-shadow-nodes.patch
mm-zero-seek-shrinkers.patch
mm-memcontrol-fix-memorystat-item-ordering.patch
