From: Peter Tyser <ptyser@xes-inc.com>
Date: Mon, 21 Sep 2009 16:20:29 +0000 (-0500)
Subject: ppc: Remove extable relocation fixups
X-Git-Tag: v2009.11-rc1~61^2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e6b05e774d7ce1641613cdeffb69c1d48139a869;p=oweals%2Fu-boot.git

ppc: Remove extable relocation fixups

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---

diff --git a/lib_ppc/extable.c b/lib_ppc/extable.c
index 91e2b3d246..7408d5c969 100644
--- a/lib_ppc/extable.c
+++ b/lib_ppc/extable.c
@@ -53,27 +53,13 @@ search_one_table(const struct exception_table_entry *first,
 		 unsigned long value)
 {
 	long diff;
-	if ((ulong) first > CONFIG_SYS_MONITOR_BASE) {
-		/* exception occurs in FLASH, before u-boot relocation.
-		 * No relocation offset is needed.
-		 */
-		while (first <= last) {
-			diff = first->insn - value;
-			if (diff == 0)
-				return first->fixup;
-			first++;
-		}
-	} else {
-		/* exception occurs in RAM, after u-boot relocation.
-		 * A relocation offset should be added.
-		 */
-		while (first <= last) {
-			diff = (first->insn + gd->reloc_off) - value;
-			if (diff == 0)
-				return (first->fixup + gd->reloc_off);
-			first++;
-		}
+	while (first <= last) {
+		diff = first->insn - value;
+		if (diff == 0)
+			return first->fixup;
+		first++;
 	}
+
 	return 0;
 }