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
x86: jump_label: arch_jump_label_text_poke_early: add missing __init
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
process_32.c
diff --git
a/arch/x86/kernel/process_32.c
b/arch/x86/kernel/process_32.c
index
a3d0dc5
..
7a3b651
100644
(file)
--- a/
arch/x86/kernel/process_32.c
+++ b/
arch/x86/kernel/process_32.c
@@
-38,6
+38,7
@@
#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/kdebug.h>
#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/kdebug.h>
+#include <linux/cpuidle.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/system.h>
@@
-109,7
+110,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_idle_call())
+ pm_idle();
start_critical_timings();
}
tick_nohz_restart_sched_tick();
start_critical_timings();
}
tick_nohz_restart_sched_tick();