From 28129285327fb7ed75ea474a8c3cc59da57be905 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Sat, 9 Feb 2013 22:52:57 -0500
Subject: [PATCH] --- yaml --- r: 351087 b: refs/heads/master c:
 3738fa5bbc3acaf6a807cb45f4367cbab412faee h: refs/heads/master i:   351085:
 7e5e87c860580edd1687e9a73d0f4c1e2ed11144   351083:
 0dc1eab1ca1ce5b7039b74dff13b5067be560a26   351079:
 094ac2d624757340529317eaedd676928bc3cf5c   351071:
 89ddfc8914cbf152a85597804b2185b697d3f016 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/sh/kernel/idle.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d5439a8eda41..087cdf45cb02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a476bda30baf7efa7f305793a340aae07b6e5780
+refs/heads/master: 3738fa5bbc3acaf6a807cb45f4367cbab412faee
diff --git a/trunk/arch/sh/kernel/idle.c b/trunk/arch/sh/kernel/idle.c
index 0c910163caa3..3d5a1b387cc0 100644
--- a/trunk/arch/sh/kernel/idle.c
+++ b/trunk/arch/sh/kernel/idle.c
@@ -22,7 +22,7 @@
 #include <asm/smp.h>
 #include <asm/bl_bit.h>
 
-void (*pm_idle)(void);
+static void (*sh_idle)(void);
 
 static int hlt_counter;
 
@@ -103,9 +103,9 @@ void cpu_idle(void)
 			/* Don't trace irqs off for idle */
 			stop_critical_timings();
 			if (cpuidle_idle_call())
-				pm_idle();
+				sh_idle();
 			/*
-			 * Sanity check to ensure that pm_idle() returns
+			 * Sanity check to ensure that sh_idle() returns
 			 * with IRQs enabled
 			 */
 			WARN_ON(irqs_disabled());
@@ -123,13 +123,13 @@ void __init select_idle_routine(void)
 	/*
 	 * If a platform has set its own idle routine, leave it alone.
 	 */
-	if (pm_idle)
+	if (sh_idle)
 		return;
 
 	if (hlt_works())
-		pm_idle = default_idle;
+		sh_idle = default_idle;
 	else
-		pm_idle = poll_idle;
+		sh_idle = poll_idle;
 }
 
 void stop_this_cpu(void *unused)