From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Randy Dunlap <rdunlap@infradead.org>,
akpm@linux-foundation.org, broonie@kernel.org, mhocko@suse.cz,
linux-next@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
mm-commits@vger.kernel.org
Subject: Re: mmotm 2018-09-12-16-40 uploaded (psi)
Date: Thu, 13 Sep 2018 13:20:12 +1000 [thread overview]
Message-ID: <20180913132012.1506f0da@canb.auug.org.au> (raw)
In-Reply-To: <20180913014222.GA2370@cmpxchg.org>
[-- Attachment #1: Type: text/plain, Size: 1334 bytes --]
Hi Johannes,
On Wed, 12 Sep 2018 21:42:22 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote:
>
> 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.
>
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
> ---
>
> diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h
> index 2e07d8f59b3e..4904c4677000 100644
> --- a/kernel/sched/stats.h
> +++ b/kernel/sched/stats.h
> @@ -132,7 +132,7 @@ static inline void psi_task_tick(struct rq *rq)
> 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) {}
I will add this to linux-next today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2018-09-13 3:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 23:40 mmotm 2018-09-12-16-40 uploaded akpm
2018-09-13 0:45 ` mmotm 2018-09-12-16-40 uploaded (psi) Randy Dunlap
2018-09-13 1:42 ` Johannes Weiner
2018-09-13 3:20 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180913132012.1506f0da@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=hannes@cmpxchg.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).