git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
idle.c
diff --git
a/arch/sh/kernel/idle.c
b/arch/sh/kernel/idle.c
index
84db0d6
..
3c45de1
100644
(file)
--- a/
arch/sh/kernel/idle.c
+++ b/
arch/sh/kernel/idle.c
@@
-16,12
+16,13
@@
#include <linux/thread_info.h>
#include <linux/irqflags.h>
#include <linux/smp.h>
#include <linux/thread_info.h>
#include <linux/irqflags.h>
#include <linux/smp.h>
+#include <linux/cpuidle.h>
#include <asm/pgalloc.h>
#include <asm/system.h>
#include <linux/atomic.h>
#include <asm/smp.h>
#include <asm/pgalloc.h>
#include <asm/system.h>
#include <linux/atomic.h>
#include <asm/smp.h>
-
void (*pm_idle)(void) = NULL
;
+
static void (*pm_idle)(void)
;
static int hlt_counter;
static int hlt_counter;
@@
-100,7
+101,8
@@
void cpu_idle(void)
local_irq_disable();
/* Don't trace irqs off for idle */
stop_critical_timings();
local_irq_disable();
/* Don't trace irqs off for idle */
stop_critical_timings();
- pm_idle();
+ if (cpuidle_call_idle())
+ pm_idle();
/*
* Sanity check to ensure that pm_idle() returns
* with IRQs enabled
/*
* Sanity check to ensure that pm_idle() returns
* with IRQs enabled