aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/process.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 18:06:19 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 18:06:19 -0500
commit43952886f0b8b3c344c3392b88de067d5fa5419a (patch)
treec1a738f11a479246c09976902be5b73aaf731722 /arch/x86/kernel/process.c
parent56dbed129df3fdd4caf9018b6e7599ee258a5420 (diff)
parentf77cfe4ea21760268c0277fa3e4b02dfd2a2c2f4 (diff)
Merge branch 'cpuidle-perf-events' into idle-test
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r--arch/x86/kernel/process.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 7c23a0cd3eb9..d8286ed54ffa 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -381,6 +381,8 @@ void default_idle(void)
381 else 381 else
382 local_irq_enable(); 382 local_irq_enable();
383 current_thread_info()->status |= TS_POLLING; 383 current_thread_info()->status |= TS_POLLING;
384 trace_power_end(smp_processor_id());
385 trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
384 } else { 386 } else {
385 local_irq_enable(); 387 local_irq_enable();
386 /* loop is done by the caller */ 388 /* loop is done by the caller */
@@ -438,8 +440,6 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait);
438 */ 440 */
439void mwait_idle_with_hints(unsigned long ax, unsigned long cx) 441void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
440{ 442{
441 trace_power_start(POWER_CSTATE, (ax>>4)+1, smp_processor_id());
442 trace_cpu_idle((ax>>4)+1, smp_processor_id());
443 if (!need_resched()) { 443 if (!need_resched()) {
444 if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLUSH_MONITOR)) 444 if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLUSH_MONITOR))
445 clflush((void *)&current_thread_info()->flags); 445 clflush((void *)&current_thread_info()->flags);
@@ -466,6 +466,8 @@ static void mwait_idle(void)
466 __sti_mwait(0, 0); 466 __sti_mwait(0, 0);
467 else 467 else
468 local_irq_enable(); 468 local_irq_enable();
469 trace_power_end(smp_processor_id());
470 trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
469 } else 471 } else
470 local_irq_enable(); 472 local_irq_enable();
471} 473}