From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 19 Mar 2016 11:28:38 +0000 (+0100)
Subject: x86/oprofile/nmi: Add missing hotplug FROZEN handling
X-Git-Tag: v4.9.8~2149^2~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57d335ce88d055eb212e2531dd7a8b4240404a57;p=platform%2Fkernel%2Flinux-rpi3.git

x86/oprofile/nmi: Add missing hotplug FROZEN handling

We really do not want to keep that nmi enabled across suspend/resume.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 1d2e6392f5fa..0e07e0968c3a 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -437,7 +437,8 @@ static int oprofile_cpu_notifier(struct notifier_block *b, unsigned long action,
 				 void *data)
 {
 	int cpu = (unsigned long)data;
-	switch (action) {
+
+	switch (action & ~CPU_TASKS_FROZEN) {
 	case CPU_DOWN_FAILED:
 	case CPU_ONLINE:
 		smp_call_function_single(cpu, nmi_cpu_up, NULL, 0);