summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2016-07-14 21:10:37 +1000
committerSasha Levin <alexander.levin@verizon.com>2016-07-19 15:49:46 -0400
commit62d7a4540e294d77c7c758ce7cd73264ba461fa8 (patch)
treece72beb4762ea193e0a8fd9ccdef30ee9f4d482c
parentbda373bb186b027786681f930959deb56f4de01b (diff)
downloadlwn-62d7a4540e294d77c7c758ce7cd73264ba461fa8.tar.gz
lwn-62d7a4540e294d77c7c758ce7cd73264ba461fa8.zip
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: Christian Zigotzky <chzigotzky@bayern-mail.de> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-rw-r--r--arch/powerpc/kernel/prom.c3
1 files changed, 1 insertions, 2 deletions
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,