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 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
kernel
/
power
/
suspend.c
diff --git
a/kernel/power/suspend.c
b/kernel/power/suspend.c
index
9a071be
..
6dadb25
100644
(file)
--- a/
kernel/power/suspend.c
+++ b/
kernel/power/suspend.c
@@
-290,7
+290,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;
@@
-317,7
+316,6
@@
static int suspend_enter(suspend_state_t state, bool *wakeup)
Enable_cpus:
enable_nonboot_cpus();
- ftrace_start();
Platform_wake:
platform_suspend_wake(state);