Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56758e3c authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Benjamin Herrenschmidt
Browse files

powerpc: remove duplicate definition of TEXASR_FS 



It appears that commits 7f06f21d ("powerpc/tm: Add checking to
treclaim/trechkpt") and e4e38121 ("KVM: PPC: Book3S HV: Add
transactional memory support") both added definitions of TEXASR_FS.
Remove one of them. At the same time, fix the alignment of the remaining
definition (should be tab-separated like the rest of the #defines).

Signed-off-by: default avatarNishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5efbabe0

arch/powerpc/include/asm/reg.h

+1 −2
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ 
#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   TEXASR_FS	__MASK(63-36) /* TEXASR Failure Summary */

#define SPRN_TFHAR	0x80	/* Transaction Failure Handler Addr */