projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cpuidle: stop depending on pm_idle
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
process.c
diff --git
a/arch/arm/kernel/process.c
b/arch/arm/kernel/process.c
index 5e1e541972277f38a123d7964fca081629584d50..d7ee0d4c072d8dba133b8160ef1ed590e14638a0 100644
(file)
--- a/
arch/arm/kernel/process.c
+++ b/
arch/arm/kernel/process.c
@@
-30,6
+30,7
@@
#include <linux/uaccess.h>
#include <linux/random.h>
#include <linux/hw_breakpoint.h>
#include <linux/uaccess.h>
#include <linux/random.h>
#include <linux/hw_breakpoint.h>
+#include <linux/cpuidle.h>
#include <asm/cacheflush.h>
#include <asm/leds.h>
#include <asm/cacheflush.h>
#include <asm/leds.h>
@@
-196,7
+197,8
@@
void cpu_idle(void)
cpu_relax();
} else {
stop_critical_timings();
cpu_relax();
} else {
stop_critical_timings();
- pm_idle();
+ if (cpuidle_call_idle())
+ pm_idle();
start_critical_timings();
/*
* This will eventually be removed - pm_idle
start_critical_timings();
/*
* This will eventually be removed - pm_idle