On Wed, 2014-05-07 at 22:00 -0700, Guenter Roeck wrote: > Both 3.10 and 3.14 are affected. > > powerpc:defconfig, powerpc:allmodconfig: > > arch/powerpc/kernel/signal_32.c: In function 'restore_tm_user_regs': > arch/powerpc/kernel/signal_32.c:867:31: error: 'TEXASR_FS' undeclared (first > use in this function) > arch/powerpc/kernel/signal_32.c:867:31: note: each undeclared identifier is > reported only once for each function it appears in > make[1]: *** [arch/powerpc/kernel/signal_32.o] Error 1 > > Due to 'powerpc/tm: Disable IRQ in tm_recheckpoint' which uses the above > define > without defining it. TEXASR_FS is defined with commit e4e381215 (KVM: PPC: > Book3S > HV: Add transactional memory support) upstream.
Argh, bugger. The below should fix both trees. It's just the #define from upstream e4e38121507a27d2ccc4b28d9e7fc4818a12c44c (we don't want the rest of that patch in stable as it's not a fix). From: Michael Neuling <[email protected]> powerpc/tm: Add missing TEXASR_FS #define This adds the missing #define for TEXASR_FS. It's from this upstream: KVM: PPC: Book3S HV: Add transactional memory support commit e4e38121507a27d2ccc4b28d9e7fc4818a12c44c Author: Michael Neuling <[email protected]> but we don't want all that patch in stable as it's not a fix. Signed-off-by: Michael Neuling <[email protected]> diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index e1fb161..795f677 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -208,6 +208,7 @@ #define SPRN_ACOP 0x1F /* Available Coprocessor Register */ #define SPRN_TFIAR 0x81 /* Transaction Failure Inst Addr */ #define SPRN_TEXASR 0x82 /* Transaction EXception & Summary */ +#define TEXASR_FS __MASK(63-36) /* Transaction Failure Summary */ #define SPRN_TEXASRU 0x83 /* '' '' '' Upper 32 */ #define SPRN_TFHAR 0x80 /* Transaction Failure Handler Addr */ #define SPRN_CTRLF 0x088 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
