Skip to content

Commit

Permalink
generic-ipi: eliminate WARN_ON()s during oops/panic
Browse files Browse the repository at this point in the history
Do not output smp-call related warnings in the oops/panic codepath.

Reported-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <49B91A7E.76E4.0078.0@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Mar 13, 2009
1 parent 25d5000 commit 641cd4c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
#include <linux/rcupdate.h>
#include <linux/rculist.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/percpu.h>
#include <linux/init.h>
Expand Down Expand Up @@ -285,7 +286,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
this_cpu = get_cpu();

/* Can deadlock when called with interrupts disabled */
WARN_ON(irqs_disabled());
WARN_ON_ONCE(irqs_disabled() && !oops_in_progress);

if (cpu == this_cpu) {
local_irq_save(flags);
Expand Down Expand Up @@ -329,7 +330,7 @@ void __smp_call_function_single(int cpu, struct call_single_data *data,
csd_lock(data);

/* Can deadlock when called with interrupts disabled */
WARN_ON(wait && irqs_disabled());
WARN_ON_ONCE(wait && irqs_disabled() && !oops_in_progress);

generic_exec_single(cpu, data, wait);
}
Expand Down Expand Up @@ -365,7 +366,7 @@ void smp_call_function_many(const struct cpumask *mask,
int cpu, next_cpu, this_cpu = smp_processor_id();

/* Can deadlock when called with interrupts disabled */
WARN_ON(irqs_disabled());
WARN_ON_ONCE(irqs_disabled() && !oops_in_progress);

/* So, what's a CPU they want? Ignoring this one. */
cpu = cpumask_first_and(mask, cpu_online_mask);
Expand Down

0 comments on commit 641cd4c

Please sign in to comment.