diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-03-19 12:28:38 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-03-19 13:40:08 +0100 |
| commit | 57d335ce88d055eb212e2531dd7a8b4240404a57 (patch) | |
| tree | 2aded463afbc1753390469d1a471d7d81cfde8df /arch/x86 | |
| parent | x86/hpet: Use proper mask to modify hotplug action (diff) | |
| download | linux-57d335ce88d055eb212e2531dd7a8b4240404a57.tar.xz linux-57d335ce88d055eb212e2531dd7a8b4240404a57.zip | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |