diff options
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
-rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index d1daead5fcdd..adb3eaf8fe2a 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
17 | #include <asm/realmode.h> | 17 | #include <asm/realmode.h> |
18 | 18 | ||
19 | #include <linux/ftrace.h> | ||
19 | #include "../../realmode/rm/wakeup.h" | 20 | #include "../../realmode/rm/wakeup.h" |
20 | #include "sleep.h" | 21 | #include "sleep.h" |
21 | 22 | ||
@@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void) | |||
107 | saved_magic = 0x123456789abcdef0L; | 108 | saved_magic = 0x123456789abcdef0L; |
108 | #endif /* CONFIG_64BIT */ | 109 | #endif /* CONFIG_64BIT */ |
109 | 110 | ||
111 | /* | ||
112 | * Pause/unpause graph tracing around do_suspend_lowlevel as it has | ||
113 | * inconsistent call/return info after it jumps to the wakeup vector. | ||
114 | */ | ||
115 | pause_graph_tracing(); | ||
110 | do_suspend_lowlevel(); | 116 | do_suspend_lowlevel(); |
117 | unpause_graph_tracing(); | ||
111 | return 0; | 118 | return 0; |
112 | } | 119 | } |
113 | 120 | ||