diff options
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r-- | arch/x86/kernel/process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index ebcfcceccc72..cbcf013a0ec6 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -372,7 +372,7 @@ static inline int hlt_use_halt(void) | |||
372 | void default_idle(void) | 372 | void default_idle(void) |
373 | { | 373 | { |
374 | if (hlt_use_halt()) { | 374 | if (hlt_use_halt()) { |
375 | trace_power_start(POWER_CSTATE, 1); | 375 | trace_power_start(POWER_CSTATE, 1, smp_processor_id()); |
376 | current_thread_info()->status &= ~TS_POLLING; | 376 | current_thread_info()->status &= ~TS_POLLING; |
377 | /* | 377 | /* |
378 | * TS_POLLING-cleared state must be visible before we | 378 | * TS_POLLING-cleared state must be visible before we |
@@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait); | |||
442 | */ | 442 | */ |
443 | void mwait_idle_with_hints(unsigned long ax, unsigned long cx) | 443 | void mwait_idle_with_hints(unsigned long ax, unsigned long cx) |
444 | { | 444 | { |
445 | trace_power_start(POWER_CSTATE, (ax>>4)+1); | 445 | trace_power_start(POWER_CSTATE, (ax>>4)+1, smp_processor_id()); |
446 | if (!need_resched()) { | 446 | if (!need_resched()) { |
447 | if (cpu_has(¤t_cpu_data, X86_FEATURE_CLFLUSH_MONITOR)) | 447 | if (cpu_has(¤t_cpu_data, X86_FEATURE_CLFLUSH_MONITOR)) |
448 | clflush((void *)¤t_thread_info()->flags); | 448 | clflush((void *)¤t_thread_info()->flags); |
@@ -458,7 +458,7 @@ void mwait_idle_with_hints(unsigned long ax, unsigned long cx) | |||
458 | static void mwait_idle(void) | 458 | static void mwait_idle(void) |
459 | { | 459 | { |
460 | if (!need_resched()) { | 460 | if (!need_resched()) { |
461 | trace_power_start(POWER_CSTATE, 1); | 461 | trace_power_start(POWER_CSTATE, 1, smp_processor_id()); |
462 | if (cpu_has(¤t_cpu_data, X86_FEATURE_CLFLUSH_MONITOR)) | 462 | if (cpu_has(¤t_cpu_data, X86_FEATURE_CLFLUSH_MONITOR)) |
463 | clflush((void *)¤t_thread_info()->flags); | 463 | clflush((void *)¤t_thread_info()->flags); |
464 | 464 | ||
@@ -479,7 +479,7 @@ static void mwait_idle(void) | |||
479 | */ | 479 | */ |
480 | static void poll_idle(void) | 480 | static void poll_idle(void) |
481 | { | 481 | { |
482 | trace_power_start(POWER_CSTATE, 0); | 482 | trace_power_start(POWER_CSTATE, 0, smp_processor_id()); |
483 | local_irq_enable(); | 483 | local_irq_enable(); |
484 | while (!need_resched()) | 484 | while (!need_resched()) |
485 | cpu_relax(); | 485 | cpu_relax(); |