From 5ad28e9a7d3936c2a5caac486e5501529a568cf0 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 14 Dec 2011 10:05:22 -0800
Subject: [PATCH] --- yaml --- r: 276787 b: refs/heads/master c:
 b1f44e13a525d2ffb7d5afe2273b7169d6f2222e h: refs/heads/master i:   276785:
 145a6fcf2d820cc9ecd1670285123103e1026908   276783:
 df17a87bb39392978269d279f6031d43dea32cb5 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/sparc/mm/btfixup.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f224d451726b..df988cb2021d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf2b92d54e73e4a2524b90d29bd498ecc4aa593
+refs/heads/master: b1f44e13a525d2ffb7d5afe2273b7169d6f2222e
diff --git a/trunk/arch/sparc/mm/btfixup.c b/trunk/arch/sparc/mm/btfixup.c
index 5175ac2f4820..8a7f81743c12 100644
--- a/trunk/arch/sparc/mm/btfixup.c
+++ b/trunk/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);