| From 8c8f38c77fccfe61501d26016b9c66c231a588ac Mon Sep 17 00:00:00 2001 |
| From: "David S. Miller" <davem@davemloft.net> |
| Date: Wed, 14 Dec 2011 10:05:22 -0800 |
| Subject: sparc32: Be less strict in matching %lo part of relocation. |
| |
| |
| From: "David S. Miller" <davem@davemloft.net> |
| |
| [ Upstream commit b1f44e13a525d2ffb7d5afe2273b7169d6f2222e ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| arch/sparc/mm/btfixup.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- 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); |
