Skip to content

Commit

Permalink
sh idle: rename global pm_idle to static sh_idle
Browse files Browse the repository at this point in the history
SH idle code could use some simplification.
This patch enables that by guaranteeing
that "sh_idle" is local, and thus architecture specific.

Signed-off-by: Len Brown <len.brown@intel.com>
Cc: linux-sh@vger.kernel.org
  • Loading branch information
Len Brown committed Feb 18, 2013
1 parent a476bda commit 3738fa5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/sh/kernel/idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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());
Expand All @@ -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)
Expand Down

0 comments on commit 3738fa5

Please sign in to comment.