commit 0a48a54e4842cf392857725a55ba8170d6071534
author Andy Gross <andy.gross@linaro.org> Fri Feb 12 15:32:51 2016 -0600
committer Andy Gross <andy.gross@linaro.org> Fri Feb 12 15:35:31 2016 -0600
tree d09b934e396a5d3acd34474d1dad1f396ff67749
parent bdb285df70f1d06d89d5cc518015737e5c4a344c

kernel: suspend: Disable lockup_detector during freeze

Signed-off-by: Andy Gross <andy.gross@linaro.org>

kernel/power/suspend.c

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index f9fe133..59e24ba 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -29,6 +29,7 @@
 #include <trace/events/power.h>
 #include <linux/compiler.h>
 #include <linux/moduleparam.h>
+#include <linux/nmi.h>
 
 #include "power.h"
 
@@ -66,6 +67,7 @@
 	suspend_freeze_state = FREEZE_STATE_ENTER;
 	spin_unlock_irq(&suspend_freeze_lock);
 
+	lockup_detector_suspend();
 	get_online_cpus();
 	cpuidle_resume();
 
@@ -79,6 +81,7 @@
 
 	cpuidle_pause();
 	put_online_cpus();
+	lockup_detector_resume();
 
 	spin_lock_irq(&suspend_freeze_lock);