* [4.1.28 PATCH] powerpc: Fix build break due to missing PPC_FEATURE2_HTM_NOSC
@ 2016-07-14 11:10 Michael Ellerman
2016-07-15 11:53 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Michael Ellerman @ 2016-07-14 11:10 UTC (permalink / raw)
To: Sasha Levin; +Cc: Christian Zigotzky, linuxppc-dev
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(-)
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,
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [4.1.28 PATCH] powerpc: Fix build break due to missing PPC_FEATURE2_HTM_NOSC
2016-07-14 11:10 [4.1.28 PATCH] powerpc: Fix build break due to missing PPC_FEATURE2_HTM_NOSC Michael Ellerman
@ 2016-07-15 11:53 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2016-07-15 11:53 UTC (permalink / raw)
To: Michael Ellerman
Cc: Christian Zigotzky, linuxppc-dev@lists.ozlabs.org,
Anton Blanchard, stable
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-15 11:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-14 11:10 [4.1.28 PATCH] powerpc: Fix build break due to missing PPC_FEATURE2_HTM_NOSC Michael Ellerman
2016-07-15 11:53 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).