projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ../mmc
[linux-2.6-block.git]
/
kernel
/
power
/
main.c
diff --git
a/kernel/power/main.c
b/kernel/power/main.c
index b8f7ce9473e8412099e476dd54a27a1a21bf8ea6..613f16941b853a4ef949eadc2bc9e54668162e70 100644
(file)
--- a/
kernel/power/main.c
+++ b/
kernel/power/main.c
@@
-22,7
+22,6
@@
#include <linux/freezer.h>
#include <linux/vmstat.h>
#include <linux/syscalls.h>
#include <linux/freezer.h>
#include <linux/vmstat.h>
#include <linux/syscalls.h>
-#include <linux/ftrace.h>
#include "power.h"
#include "power.h"
@@
-317,7
+316,7
@@
static int suspend_enter(suspend_state_t state)
*/
int suspend_devices_and_enter(suspend_state_t state)
{
*/
int suspend_devices_and_enter(suspend_state_t state)
{
- int error
, ftrace_save
;
+ int error;
if (!suspend_ops)
return -ENOSYS;
if (!suspend_ops)
return -ENOSYS;
@@
-328,7
+327,6
@@
int suspend_devices_and_enter(suspend_state_t state)
goto Close;
}
suspend_console();
goto Close;
}
suspend_console();
- ftrace_save = __ftrace_enabled_save();
suspend_test_start();
error = device_suspend(PMSG_SUSPEND);
if (error) {
suspend_test_start();
error = device_suspend(PMSG_SUSPEND);
if (error) {
@@
-360,7
+358,6
@@
int suspend_devices_and_enter(suspend_state_t state)
suspend_test_start();
device_resume(PMSG_RESUME);
suspend_test_finish("resume devices");
suspend_test_start();
device_resume(PMSG_RESUME);
suspend_test_finish("resume devices");
- __ftrace_enabled_restore(ftrace_save);
resume_console();
Close:
if (suspend_ops->end)
resume_console();
Close:
if (suspend_ops->end)