Re: [PATCH] x86: Clean up mwait_play_dead

From: Frank Arnold
Date: Thu Apr 14 2011 - 07:44:54 EST


On Wed, 2011-04-13 at 13:49 -0400, Ingo Molnar wrote:
> * Borislav Petkov <bp@xxxxxxxxx> wrote:
>
> > On Wed, Apr 13, 2011 at 09:52:40AM -0700, H. Peter Anvin wrote:
> > > On 04/13/2011 09:11 AM, Frank Arnold wrote:
> > > > From: Frank Arnold <frank.arnold@xxxxxxx>
> > > >
> > > > Commit 93789b32dbf355e70f18b17a82e8661677a7f7fb introduced
> > > > cpuinfo_x86 *c for brevity. It is used to check for the
> > > > mwait feature flag. The same can be done with a subsequent
> > > > check for clflsh and save us a second per-cpu pointer
> > > > dereference.
> > > >
> > > > Signed-off-by: Frank Arnold <frank.arnold@xxxxxxx>
> > > > Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
> > > > ---
> > > > arch/x86/kernel/smpboot.c | 2 +-
> > > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > > >
> > >
> > > This should be using this_cpu_has()... if that's not in the tree yet we
> > > should add it.
> >
> > Looks like it is still in tip/x86/mm.
>
> Yeah - that patch was sent at around the beginning of the merge window, so it
> was too late for .39.
>
> > We could either redo the patch properly when this_cpu_has() is merged or add
> > the change against that branch.
>
> Yeah - please do one against tip:master and we'll put it into the right topic
> branch.

It's already fixed in tip:master with the proper use of this_cpu_has().
commit 349c004e3d31fda23ad225b61861be38047fff16

Sorry for the noise.

--
Frank.

Advanced Micro Devices GmbH
Sitz: Dornach, Gemeinde Aschheim,
Landkreis MÃnchen Registergericht MÃnchen,
HRB Nr. 43632 - WEEE Registrierungsnummer 129 19551
GeschÃftsfÃhrer: Alberto Bozzo, Andrew Bowd


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/