Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205270
b: refs/heads/master
c: c882e0f
h: refs/heads/master
v: v3
  • Loading branch information
Robert Schöne authored and Ingo Molnar committed Jun 18, 2010
1 parent 8024a77 commit 226db98
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 646b1db4956ba8bf748b835b5eba211133d91c2e
refs/heads/master: c882e0feb937af4e5b991cbd1c81536f37053e86
4 changes: 4 additions & 0 deletions trunk/arch/x86/kernel/process_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
#include <asm/syscalls.h>
#include <asm/debugreg.h>

#include <trace/events/power.h>

asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");

/*
Expand Down Expand Up @@ -111,6 +113,8 @@ void cpu_idle(void)
stop_critical_timings();
pm_idle();
start_critical_timings();

trace_power_end(smp_processor_id());
}
tick_nohz_restart_sched_tick();
preempt_enable_no_resched();
Expand Down
5 changes: 5 additions & 0 deletions trunk/arch/x86/kernel/process_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
#include <asm/syscalls.h>
#include <asm/debugreg.h>

#include <trace/events/power.h>

asmlinkage extern void ret_from_fork(void);

DEFINE_PER_CPU(unsigned long, old_rsp);
Expand Down Expand Up @@ -138,6 +140,9 @@ void cpu_idle(void)
stop_critical_timings();
pm_idle();
start_critical_timings();

trace_power_end(smp_processor_id());

/* In many cases the interrupt that ended idle
has already called exit_idle. But some idle
loops can be woken up without interrupt. */
Expand Down

0 comments on commit 226db98

Please sign in to comment.