From ab75be4b1613ca0b52c0f16536a2e0b2b8a7c357 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 26 Feb 2008 17:30:02 -0800
Subject: [PATCH] --- yaml --- r: 86431 b: refs/heads/master c:
 622eaec613130e6ea78f2a5d5070e3278b21cd8f h: refs/heads/master i:   86429:
 dcff3c8f6be34e7c90103ddcaf16a64699a64421   86427:
 487ca27f4bc1fda2e8376ebf573abb374c3f4791   86423:
 1b915de251e04198ba0310d030112f7d69ad5e64   86415:
 2698d42923918632b32e3778bc63e963748e1743   86399:
 25a0c42b1e082da2e1a1ef16d6cc250badc3d6d3 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/sparc64/mm/fault.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8af5ec45bccc..c0cb8e746bdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 896aef430e5afb56b5f7b1d959226b8a6a08108a
+refs/heads/master: 622eaec613130e6ea78f2a5d5070e3278b21cd8f
diff --git a/trunk/arch/sparc64/mm/fault.c b/trunk/arch/sparc64/mm/fault.c
index e2027f27c0fe..918363360280 100644
--- a/trunk/arch/sparc64/mm/fault.c
+++ b/trunk/arch/sparc64/mm/fault.c
@@ -244,16 +244,8 @@ static void do_kernel_fault(struct pt_regs *regs, int si_code, int fault_code,
 	if (regs->tstate & TSTATE_PRIV) {
 		const struct exception_table_entry *entry;
 
-		if (asi == ASI_P && (insn & 0xc0800000) == 0xc0800000) {
-			if (insn & 0x2000)
-				asi = (regs->tstate >> 24);
-			else
-				asi = (insn >> 5);
-		}
-	
-		/* Look in asi.h: All _S asis have LS bit set */
-		if ((asi & 0x1) &&
-		    (entry = search_exception_tables(regs->tpc))) {
+		entry = search_exception_tables(regs->tpc);
+		if (entry) {
 			regs->tpc = entry->fixup;
 			regs->tnpc = regs->tpc + 4;
 			return;