diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 03:41:47 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 03:41:47 +0400 |
| commit | e894245c78b4d5b69074dc8d7f671770f513a4b6 (patch) | |
| tree | 18824efee368b949865532bf9c478ab6031d3aae /kernel/power | |
| parent | ce63e1862ce81d85df9e3239e4467ac765e04962 (diff) | |
| parent | 536446772f1181f3afdf332780b5325d1b6980c6 (diff) | |
| download | linux-e894245c78b4d5b69074dc8d7f671770f513a4b6.tar.xz | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Sleep: new trace event to print device suspend and resume times
PM / Sleep: increase ftrace coverage in suspend/resume
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index ece04223bb1e..62ee437b5c7e 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -210,6 +210,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) goto Platform_wake; } + ftrace_stop(); error = disable_nonboot_cpus(); if (error || suspend_test(TEST_CPUS)) goto Enable_cpus; @@ -232,6 +233,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) Enable_cpus: enable_nonboot_cpus(); + ftrace_start(); Platform_wake: if (need_suspend_ops(state) && suspend_ops->wake) @@ -265,7 +267,6 @@ int suspend_devices_and_enter(suspend_state_t state) goto Close; } suspend_console(); - ftrace_stop(); suspend_test_start(); error = dpm_suspend_start(PMSG_SUSPEND); if (error) { @@ -285,7 +286,6 @@ int suspend_devices_and_enter(suspend_state_t state) suspend_test_start(); dpm_resume_end(PMSG_RESUME); suspend_test_finish("resume devices"); - ftrace_start(); resume_console(); Close: if (need_suspend_ops(state) && suspend_ops->end) |