diff options
author | Nishanth Aravamudan <nacc@linux.vnet.ibm.com> | 2014-08-11 19:43:18 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-08-13 01:13:47 -0400 |
commit | 56758e3c3ca7e3d8960e0e8f881e80adf119f4fe (patch) | |
tree | e9c8aa463f205058b73fdcad109514e7fe55326f /arch/powerpc | |
parent | 5efbabe09d986f25c02d19954660238fcd7f008a (diff) |
powerpc: remove duplicate definition of TEXASR_FS
It appears that commits 7f06f21d40a6 ("powerpc/tm: Add checking to
treclaim/trechkpt") and e4e38121507a ("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: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/include/asm/reg.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index 1c987bf794ef..0c0505956a29 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h | |||
@@ -213,9 +213,8 @@ | |||
213 | #define SPRN_ACOP 0x1F /* Available Coprocessor Register */ | 213 | #define SPRN_ACOP 0x1F /* Available Coprocessor Register */ |
214 | #define SPRN_TFIAR 0x81 /* Transaction Failure Inst Addr */ | 214 | #define SPRN_TFIAR 0x81 /* Transaction Failure Inst Addr */ |
215 | #define SPRN_TEXASR 0x82 /* Transaction EXception & Summary */ | 215 | #define SPRN_TEXASR 0x82 /* Transaction EXception & Summary */ |
216 | #define TEXASR_FS __MASK(63-36) /* Transaction Failure Summary */ | ||
217 | #define SPRN_TEXASRU 0x83 /* '' '' '' Upper 32 */ | 216 | #define SPRN_TEXASRU 0x83 /* '' '' '' Upper 32 */ |
218 | #define TEXASR_FS __MASK(63-36) /* TEXASR Failure Summary */ | 217 | #define TEXASR_FS __MASK(63-36) /* TEXASR Failure Summary */ |
219 | #define SPRN_TFHAR 0x80 /* Transaction Failure Handler Addr */ | 218 | #define SPRN_TFHAR 0x80 /* Transaction Failure Handler Addr */ |
220 | #define SPRN_CTRLF 0x088 | 219 | #define SPRN_CTRLF 0x088 |
221 | #define SPRN_CTRLT 0x098 | 220 | #define SPRN_CTRLT 0x098 |