From 2e796ee1473034743cffdc9a0db142d8e97b5b6c Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 13 Mar 2009 10:47:34 +0100 Subject: [PATCH] --- yaml --- r: 140431 b: refs/heads/master c: 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc h: refs/heads/master i: 140429: b7d4ce47dcd770aec5f7b90e4cef32a5fd5d2780 140427: bf11b096f927cd69897854fc28db7c5e0cbf6c68 140423: eb4c3f23db85765a0d526e52db25816d3f3bc867 140415: 37995231e4a38607119964d71fedd717e9365184 v: v3 --- [refs] | 2 +- trunk/kernel/smp.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 674bd2887378..62508439304e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25d500067d5a666d1336598d1b324793554e5496 +refs/heads/master: 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc diff --git a/trunk/kernel/smp.c b/trunk/kernel/smp.c index 7ad2262d2eca..858baac568ee 100644 --- a/trunk/kernel/smp.c +++ b/trunk/kernel/smp.c @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include @@ -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); @@ -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); } @@ -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);