Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da3e7add authored by Michael Ellerman's avatar Michael Ellerman Committed by Sasha Levin
Browse files

powerpc: Fix build break due to missing PPC_FEATURE2_HTM_NOSC 



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: default avatarChristian Zigotzky <chzigotzky@bayern-mail.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 8c8e669b

arch/powerpc/kernel/prom.c

+1 −2
Original line number Diff line number Diff line
@@ -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,