git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
[pandora-kernel.git]
/
kernel
/
power
/
suspend.c
diff --git
a/kernel/power/suspend.c
b/kernel/power/suspend.c
index
ed35a47
..
4b736b4
100644
(file)
--- a/
kernel/power/suspend.c
+++ b/
kernel/power/suspend.c
@@
-248,7
+248,6
@@
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;
@@
-275,7
+274,6
@@
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)