]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: remove duplicate definition of TEXASR_FS
authorNishanth Aravamudan <nacc@linux.vnet.ibm.com>
Mon, 11 Aug 2014 23:43:18 +0000 (16:43 -0700)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 13 Aug 2014 05:13:47 +0000 (15:13 +1000)
commit8543ebc6fe499ad8c30181dac1e7afd02aa9b0f6
treee9c8aa463f205058b73fdcad109514e7fe55326f
parente96280a9f9631c0ab6b812b47134c25d27c342b7
powerpc: remove duplicate definition of TEXASR_FS

It appears that commits abe996ed68a3 ("powerpc/tm: Add checking to
treclaim/trechkpt") and 70942343c705 ("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>
arch/powerpc/include/asm/reg.h