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 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
idle.c
diff --git
a/arch/powerpc/kernel/idle.c
b/arch/powerpc/kernel/idle.c
index
a9e9cbd
..
d308a9f
100644
(file)
--- a/
arch/powerpc/kernel/idle.c
+++ b/
arch/powerpc/kernel/idle.c
@@
-24,6
+24,7
@@
#include <linux/smp.h>
#include <linux/cpu.h>
#include <linux/sysctl.h>
#include <linux/smp.h>
#include <linux/cpu.h>
#include <linux/sysctl.h>
+#include <linux/tick.h>
#include <asm/system.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/processor.h>
@@
-59,6
+60,7
@@
void cpu_idle(void)
set_thread_flag(TIF_POLLING_NRFLAG);
while (1) {
set_thread_flag(TIF_POLLING_NRFLAG);
while (1) {
+ tick_nohz_stop_sched_tick(1);
while (!need_resched() && !cpu_should_die()) {
ppc64_runlatch_off();
while (!need_resched() && !cpu_should_die()) {
ppc64_runlatch_off();
@@
-90,6
+92,7
@@
void cpu_idle(void)
HMT_medium();
ppc64_runlatch_on();
HMT_medium();
ppc64_runlatch_on();
+ tick_nohz_restart_sched_tick();
if (cpu_should_die())
cpu_die();
preempt_enable_no_resched();
if (cpu_should_die())
cpu_die();
preempt_enable_no_resched();
@@
-119,7
+122,7
@@
static ctl_table powersave_nap_sysctl_root[] = {
{
.ctl_name = CTL_KERN,
.procname = "kernel",
{
.ctl_name = CTL_KERN,
.procname = "kernel",
- .mode = 0
7
55,
+ .mode = 0
5
55,
.child = powersave_nap_ctl_table,
},
{}
.child = powersave_nap_ctl_table,
},
{}