Commit 2b014666 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

PM / Sleep: Remove ftrace_stop/start() from suspend and hibernate 

ftrace_stop() and ftrace_start() were added to the suspend and hibernate
process because there was some function within the work flow that caused
the system to reboot if it was traced. This function has recently been
found (restore_processor_state()). Now there's no reason to disable
function tracing while we are going into suspend or hibernate, which means
that being able to trace this will help tremendously in debugging any
issues with suspend or hibernate.

This also means that the ftrace_stop/start() functions can be removed
and simplify the function tracing code a bit.

Link: http://lkml.kernel.org/r/1518201.VD9cU33jRU@vostro.rjw.lan



Acked-by: default avatar"Rafael J. Wysocki" <rjw@rjwysocki.net>
Reviewed-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent b8f99b3e

kernel/power/hibernate.c

+0 −6
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ int hibernation_snapshot(int platform_mode) 
	}



	suspend_console();

	ftrace_stop();

	pm_restrict_gfp_mask();



	error = dpm_suspend(PMSG_FREEZE);
@@ -397,7 +396,6 @@ int hibernation_snapshot(int platform_mode) 
	if (error || !in_suspend)

		pm_restore_gfp_mask();



	ftrace_start();

	resume_console();

	dpm_complete(msg);
@@ -500,7 +498,6 @@ int hibernation_restore(int platform_mode) 


	pm_prepare_console();

	suspend_console();

	ftrace_stop();

	pm_restrict_gfp_mask();

	error = dpm_suspend_start(PMSG_QUIESCE);

	if (!error) {
@@ -508,7 +505,6 @@ int hibernation_restore(int platform_mode) 
		dpm_resume_end(PMSG_RECOVER);

	}

	pm_restore_gfp_mask();

	ftrace_start();

	resume_console();

	pm_restore_console();

	return error;
@@ -535,7 +531,6 @@ int hibernation_platform_enter(void) 


	entering_platform_hibernation = true;

	suspend_console();

	ftrace_stop();

	error = dpm_suspend_start(PMSG_HIBERNATE);

	if (error) {

		if (hibernation_ops->recover)
@@ -579,7 +574,6 @@ int hibernation_platform_enter(void) 
 Resume_devices:

	entering_platform_hibernation = false;

	dpm_resume_end(PMSG_RESTORE);

	ftrace_start();

	resume_console();



 Close:

kernel/power/suspend.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE