From 0ebb3492b791490324120a400c08e89d0d57b9c5 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 13 Feb 2013 17:03:16 +0000
Subject: [PATCH] --- yaml --- r: 356415 b: refs/heads/master c:
 97db7f7d056ceb017b1bec2657c58f64e7b160ba h: refs/heads/master i:   356413:
 e3a9dc1f8279efe31aee64f1d1fab34468844d64   356411:
 0d3a3a39f73c8e5c1ae635f35d46eec55d18fe80   356407:
 60a4552c2d6cbf78869453179e5fddba6bcdd14c   356399:
 973d2c7125fa9156e38814add5dd12c5d169d4f0   356383:
 30e4430505a97a27273f992e8257bd55b6c5975e   356351:
 0d2f364b8505d37b42a748d7b7f8a1712c859fdf v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/powerpc/platforms/ps3/htab.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1ae305fc8abb..a1188fa6d7d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a564c4d1fc7f077c6135afe5c2890a262d71264
+refs/heads/master: 97db7f7d056ceb017b1bec2657c58f64e7b160ba
diff --git a/trunk/arch/powerpc/platforms/ps3/htab.c b/trunk/arch/powerpc/platforms/ps3/htab.c
index d00d7b0a3bda..6cc58201db8c 100644
--- a/trunk/arch/powerpc/platforms/ps3/htab.c
+++ b/trunk/arch/powerpc/platforms/ps3/htab.c
@@ -27,6 +27,7 @@
 #include <asm/lv1call.h>
 #include <asm/ps3fb.h>
 
+#define PS3_VERBOSE_RESULT
 #include "platform.h"
 
 /**
@@ -75,8 +76,9 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn,
 
 	if (result) {
 		/* all entries bolted !*/
-		pr_info("%s:result=%d vpn=%lx pa=%lx ix=%lx v=%llx r=%llx\n",
-			__func__, result, vpn, pa, hpte_group, hpte_v, hpte_r);
+		pr_info("%s:result=%s vpn=%lx pa=%lx ix=%lx v=%llx r=%llx\n",
+			__func__, ps3_result(result), vpn, pa, hpte_group,
+			hpte_v, hpte_r);
 		BUG();
 	}
 
@@ -125,8 +127,8 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
 				       &hpte_rs);
 
 	if (result) {
-		pr_info("%s: res=%d read vpn=%lx slot=%lx psize=%d\n",
-			__func__, result, vpn, slot, psize);
+		pr_info("%s: result=%s read vpn=%lx slot=%lx psize=%d\n",
+			__func__, ps3_result(result), vpn, slot, psize);
 		BUG();
 	}
 
@@ -170,8 +172,8 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long vpn,
 	result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, slot, 0, 0);
 
 	if (result) {
-		pr_info("%s: res=%d vpn=%lx slot=%lx psize=%d\n",
-			__func__, result, vpn, slot, psize);
+		pr_info("%s: result=%s vpn=%lx slot=%lx psize=%d\n",
+			__func__, ps3_result(result), vpn, slot, psize);
 		BUG();
 	}