From ac0f95e2e7070b8bd451c57ee28bedb6a343669f Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Thu, 1 May 2008 08:24:58 +1000
Subject: [PATCH] --- yaml --- r: 95851 b: refs/heads/master c:
 bbea34606269efedf7d12c608924b47bafb344f5 h: refs/heads/master i:   95849:
 63df889513eab158fd7bcfaebc0dc16ab572a80c   95847:
 7d92e4cc7309ccf6ff510c9257b98676fa3fa55a v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/mm/slb.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 50444bbfd859..7afa89e93189 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5be661a28b12aa43cc83ba935ba2b2c273d0da45
+refs/heads/master: bbea34606269efedf7d12c608924b47bafb344f5
diff --git a/trunk/arch/powerpc/mm/slb.c b/trunk/arch/powerpc/mm/slb.c
index 906daeda59a8..497ec059bc82 100644
--- a/trunk/arch/powerpc/mm/slb.c
+++ b/trunk/arch/powerpc/mm/slb.c
@@ -30,7 +30,7 @@
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
 #else
-#define DBG(fmt...)
+#define DBG pr_debug
 #endif
 
 extern void slb_allocate_realmode(unsigned long ea);
@@ -279,8 +279,8 @@ void slb_initialize(void)
 		patch_slb_encoding(slb_compare_rr_to_size,
 				   mmu_slb_size);
 
-		DBG("SLB: linear  LLP = %04x\n", linear_llp);
-		DBG("SLB: io      LLP = %04x\n", io_llp);
+		DBG("SLB: linear  LLP = %04lx\n", linear_llp);
+		DBG("SLB: io      LLP = %04lx\n", io_llp);
 	}
 
 	get_paca()->stab_rr = SLB_NUM_BOLTED;