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
Merge branch 'v3.10/topic/big.LITTLE' into linux-linaro-lsk-v3.10
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
cpufreq
/
speedstep-lib.c
diff --git
a/drivers/cpufreq/speedstep-lib.c
b/drivers/cpufreq/speedstep-lib.c
index 7047821a7f8a5fd966521ba5a8d48bf7664d2d54..4ab7a215667249326d4b1b81b2144b56767b0dcd 100644
(file)
--- a/
drivers/cpufreq/speedstep-lib.c
+++ b/
drivers/cpufreq/speedstep-lib.c
@@
-400,6
+400,7
@@
unsigned int speedstep_get_freqs(enum speedstep_processor processor,
pr_debug("previous speed is %u\n", prev_speed);
+ preempt_disable();
local_irq_save(flags);
/* switch to low state */
@@
-464,6
+465,8
@@
unsigned int speedstep_get_freqs(enum speedstep_processor processor,
out:
local_irq_restore(flags);
+ preempt_enable();
+
return ret;
}
EXPORT_SYMBOL_GPL(speedstep_get_freqs);