]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
powerpc/tm: Limit TM code inside PPC_TRANSACTIONAL_MEM
authorBreno Leitao <leitao@debian.org>
Wed, 9 Jan 2019 13:16:45 +0000 (11:16 -0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 11 Jan 2019 12:45:00 +0000 (23:45 +1100)
commit897bc3df8c5aebb54c32d831f917592e873d0559
treeffe77011a0e0359f84fc018ba6a3fc77918d280c
parentfb0bdec51a4901b7dd088de0a1e365e1b9f5cd21
powerpc/tm: Limit TM code inside PPC_TRANSACTIONAL_MEM

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@vger.kernel.org
Reported-by: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
Fixes: e1c3743e1a20 ("powerpc/tm: Set MSR[TS] just prior to recheckpoint")
Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/signal_64.c