| Message ID | 87bn20a30y.fsf@@concordia.ellerman.id.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 07/14/2016 07:10 AM, Michael Ellerman wrote: > The backport of 4705e02498d6 ("powerpc: Update TM user feature bits in > scan_features()") (f49eb503f0f9), missed the fact that 4.1 doesn't > include the commit that added PPC_FEATURE2_HTM_NOSC. > > The correct fix is simply to omit PPC_FEATURE2_HTM_NOSC. > > Fixes: f49eb503f0f9 ("powerpc: Update TM user feature bits in scan_features()") > Reported-by: Christian Zigotzky <chzigotzky@bayern-mail.de> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Thanks Michael, I've queued it up. Thanks, Sasha
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 28dbbb0d12c4..9b19d96e9562 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -166,8 +166,7 @@ static struct ibm_pa_feature { * we don't want to turn on TM here, so we use the *_COMP versions * which are 0 if the kernel doesn't support TM. */ - {CPU_FTR_TM_COMP, 0, 0, - PPC_FEATURE2_HTM_COMP|PPC_FEATURE2_HTM_NOSC_COMP, 22, 0, 0}, + {CPU_FTR_TM_COMP, 0, 0, PPC_FEATURE2_HTM_COMP, 22, 0, 0}, }; static void __init scan_features(unsigned long node, const unsigned char *ftrs,
The backport of 4705e02498d6 ("powerpc: Update TM user feature bits in scan_features()") (f49eb503f0f9), missed the fact that 4.1 doesn't include the commit that added PPC_FEATURE2_HTM_NOSC. The correct fix is simply to omit PPC_FEATURE2_HTM_NOSC. Fixes: f49eb503f0f9 ("powerpc: Update TM user feature bits in scan_features()") Reported-by: Christian Zigotzky <chzigotzky@bayern-mail.de> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/kernel/prom.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)