]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
x86/oprofile/nmi: Add missing hotplug FROZEN handling
authorThomas Gleixner <tglx@linutronix.de>
Sat, 19 Mar 2016 11:28:38 +0000 (12:28 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 19 Mar 2016 12:40:08 +0000 (13:40 +0100)
We really do not want to keep that nmi enabled across suspend/resume.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/oprofile/nmi_int.c

index 1d2e6392f5faaf6f450cdfa598b9b2a734064962..0e07e0968c3a0d5959d554c0c29ab358eb78b82b 100644 (file)
@@ -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);