Skip to content

Commit

Permalink
powerpc: Fix build break due to missing PPC_FEATURE2_HTM_NOSC
Browse files Browse the repository at this point in the history
The backport of 4705e02 ("powerpc: Update TM user feature bits in
scan_features()") (f49eb50), 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: f49eb50 ("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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
  • Loading branch information
Michael Ellerman authored and Sasha Levin committed Jul 20, 2016
1 parent 8c8e669 commit da3e7ad
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/powerpc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit da3e7ad

Please sign in to comment.