From c6cc4d1d6385f48e4bba115fb0bacef3ce8accad Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 17 Feb 2006 14:40:30 -0800
Subject: [PATCH] --- yaml --- r: 21491 b: refs/heads/master c:
 12e126ad229abc718d05600027fcd5794c1e31e5 h: refs/heads/master i:   21489:
 52e20593583d4cc86b8ee3560677ad320170722a   21487:
 9efde234397f5421d3e15ed92e18df13aa82bf28 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sparc64/mm/init.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1d61fcff4b13..8a42c87f8710 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52845cdb3b9c4c5fe1c2e295bd14457ff8dd6bcc
+refs/heads/master: 12e126ad229abc718d05600027fcd5794c1e31e5
diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c
index 950d58082e28..bd9e3205674b 100644
--- a/trunk/arch/sparc64/mm/init.c
+++ b/trunk/arch/sparc64/mm/init.c
@@ -510,6 +510,11 @@ static void __init hypervisor_tlb_lock(unsigned long vaddr,
 			       "=&r" (arg3)
 			     : "0" (func), "1" (arg0), "2" (arg1),
 			       "3" (arg2), "4" (arg3));
+	if (arg0 != 0) {
+		prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: "
+			    "errors with %lx\n", vaddr, 0, pte, mmu, arg0);
+		prom_halt();
+	}
 }
 
 static unsigned long kern_large_tte(unsigned long paddr);