git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[sfrench/cifs-2.6.git]
/
drivers
/
idle
/
intel_idle.c
diff --git
a/drivers/idle/intel_idle.c
b/drivers/idle/intel_idle.c
index 54f0fb4cd5d25086701ad23243f97f138a645233..03d202b1ff2764d44e7bebbadc6f9fc80052bfdb 100755
(executable)
--- a/
drivers/idle/intel_idle.c
+++ b/
drivers/idle/intel_idle.c
@@
-231,7
+231,7
@@
static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
stop_critical_timings();
#ifndef MODULE
- trace_power_start(POWER_CSTATE, (eax >> 4) + 1);
+ trace_power_start(POWER_CSTATE, (eax >> 4) + 1
, cpu
);
#endif
if (!need_resched()) {