brick_say: fix detection of in_atomic()

This commit is contained in:
Thomas Schoebel-Theuer 2012-09-24 09:24:05 +02:00 committed by Thomas Schoebel-Theuer
parent 19f1b85616
commit a24d18d620
1 changed files with 1 additions and 1 deletions

View File

@ -94,7 +94,7 @@ static
void _say_mark(unsigned long cpu)
{
char *ptr;
bool use_atomic = (preempt_count() & (SOFTIRQ_MASK | HARDIRQ_MASK | NMI_MASK)) != 0 || irqs_disabled();
bool use_atomic = (preempt_count() & (SOFTIRQ_MASK | HARDIRQ_MASK | NMI_MASK)) != 0 || in_atomic() || irqs_disabled();
say_alloc(cpu, use_atomic);
if (unlikely(use_atomic || cpu >= NR_CPUS))