summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-14 19:05:22 +0100
committerDavid S. Miller <davem@davemloft.net>2011-12-14 19:57:28 +0100
commitb1f44e13a525d2ffb7d5afe2273b7169d6f2222e (patch)
treeba282dbd218ad8cf2e51e5325fecd43a4554c9d7 /arch
parentsbus: convert drivers/sbus/char/* to use module_platform_driver() (diff)
downloadlinux-b1f44e13a525d2ffb7d5afe2273b7169d6f2222e.tar.xz
linux-b1f44e13a525d2ffb7d5afe2273b7169d6f2222e.zip
sparc32: Be less strict in matching %lo part of relocation.
The "(insn & 0x01800000) != 0x01800000" test matches 'restore' but that is a legitimate place to see the %lo() part of a 32-bit symbol relocation, particularly in tail calls. Signed-off-by: David S. Miller <davem@davemloft.net> Tested-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/mm/btfixup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c
index 5175ac2f4820..8a7f81743c12 100644
--- a/arch/sparc/mm/btfixup.c
+++ b/arch/sparc/mm/btfixup.c
@@ -302,8 +302,7 @@ void __init btfixup(void)
case 'i': /* INT */
if ((insn & 0xc1c00000) == 0x01000000) /* %HI */
set_addr(addr, q[1], fmangled, (insn & 0xffc00000) | (p[1] >> 10));
- else if ((insn & 0x80002000) == 0x80002000 &&
- (insn & 0x01800000) != 0x01800000) /* %LO */
+ else if ((insn & 0x80002000) == 0x80002000) /* %LO */
set_addr(addr, q[1], fmangled, (insn & 0xffffe000) | (p[1] & 0x3ff));
else {
prom_printf(insn_i, p, addr, insn);