git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5efbabe)
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)
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>
arch/powerpc/include/asm/reg.h patch | blob | history

diff --cc arch/powerpc/include/asm/reg.h
Simple merge
Pandora Kernel Repository