On Thu, 3 Mar 2016 02:36:26 +0100 "Rafael J. Wysocki" <rafael@xxxxxxxxxx> wrote: > > OK, applied, but let Steven and the x86 folks see it. The below patch looks fine to me. Anything else I should look at? -- Steve > > > >>> > >>> > --- > >>> > arch/x86/kernel/acpi/sleep.c | 7 +++++++ > >>> > 1 file changed, 7 insertions(+) > >>> > > >>> > diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c > >>> > index d1daead..311360e 100644 > >>> > --- a/arch/x86/kernel/acpi/sleep.c > >>> > +++ b/arch/x86/kernel/acpi/sleep.c > >>> > @@ -16,6 +16,7 @@ > >>> > #include <asm/cacheflush.h> > >>> > #include <asm/realmode.h> > >>> > > >>> > +#include <linux/ftrace.h> > >>> > #include "../../realmode/rm/wakeup.h" > >>> > #include "sleep.h" > >>> > > >>> > @@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void) > >>> > saved_magic = 0x123456789abcdef0L; > >>> > #endif /* CONFIG_64BIT */ > >>> > > >>> > + /* > >>> > + * Pause/unpause graph tracing around do_suspend_lowlevel as it has > >>> > + * inconsistent call/return info after it jumps to the wakeup vector > >>> > + */ > >>> > + pause_graph_tracing(); > >>> > do_suspend_lowlevel(); > >>> > + unpause_graph_tracing(); > >>> > return 0; > >>> > } > >>> > > >>> > -- > >>> > 2.1.4 > >>> > > >>> > -- > > > > > > Thanks, > > Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
