powerpc/tm: Limit TM code inside PPC_TRANSACTIONAL_MEM

Michael Ellerman patch-notifications at ellerman.id.au
Mon Jan 14 21:12:08 AEDT 2019


On Wed, 2019-01-09 at 13:16:45 UTC, Breno Leitao wrote:
> Commit e1c3743e1a20 ("powerpc/tm: Set MSR[TS] just prior to recheckpoint")
> moved a code block around and this block uses a 'msr' variable outside of
> the CONFIG_PPC_TRANSACTIONAL_MEM, however the 'msr' variable is declared
> inside a CONFIG_PPC_TRANSACTIONAL_MEM block, causing a possible error when
> CONFIG_PPC_TRANSACTION_MEM is not defined.
> 
> 	error: 'msr' undeclared (first use in this function)
> 
> This is not causing a compilation error in the mainline kernel, because
> 'msr' is being used as an argument of MSR_TM_ACTIVE(), which is defined as
> the following when CONFIG_PPC_TRANSACTIONAL_MEM is *not* set:
> 
> 	#define MSR_TM_ACTIVE(x) 0
> 
> This patch just fixes this issue avoiding the 'msr' variable usage outside
> the CONFIG_PPC_TRANSACTIONAL_MEM block, avoiding trusting in the
> MSR_TM_ACTIVE() definition.
> 
> Cc: stable at vger.kernel.org
> Reported-by: Christoph Biedl <linux-kernel.bfrz at manchmal.in-ulm.de>
> Fixes: e1c3743e1a20 ("powerpc/tm: Set MSR[TS] just prior to recheckpoint")
> Signed-off-by: Breno Leitao <leitao at debian.org>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/897bc3df8c5aebb54c32d831f917592e

cheers


More information about the Linuxppc-dev mailing list