diff options
Diffstat (limited to 'kernel/power/suspend.c')
| -rw-r--r-- | kernel/power/suspend.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 396d262b8fd0..c8b7446b27df 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/export.h> | 24 | #include <linux/export.h> |
| 25 | #include <linux/suspend.h> | 25 | #include <linux/suspend.h> |
| 26 | #include <linux/syscore_ops.h> | 26 | #include <linux/syscore_ops.h> |
| 27 | #include <linux/ftrace.h> | ||
| 27 | #include <trace/events/power.h> | 28 | #include <trace/events/power.h> |
| 28 | 29 | ||
| 29 | #include "power.h" | 30 | #include "power.h" |
| @@ -212,6 +213,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 212 | goto Close; | 213 | goto Close; |
| 213 | } | 214 | } |
| 214 | suspend_console(); | 215 | suspend_console(); |
| 216 | ftrace_stop(); | ||
| 215 | suspend_test_start(); | 217 | suspend_test_start(); |
| 216 | error = dpm_suspend_start(PMSG_SUSPEND); | 218 | error = dpm_suspend_start(PMSG_SUSPEND); |
| 217 | if (error) { | 219 | if (error) { |
| @@ -231,6 +233,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 231 | suspend_test_start(); | 233 | suspend_test_start(); |
| 232 | dpm_resume_end(PMSG_RESUME); | 234 | dpm_resume_end(PMSG_RESUME); |
| 233 | suspend_test_finish("resume devices"); | 235 | suspend_test_finish("resume devices"); |
| 236 | ftrace_start(); | ||
| 234 | resume_console(); | 237 | resume_console(); |
| 235 | Close: | 238 | Close: |
| 236 | if (suspend_ops->end) | 239 | if (suspend_ops->end) |
