From 9183d13b3877085a1892b3671a47a5f211dbcae5 Mon Sep 17 00:00:00 2001 From: Steven Miao Date: Fri, 25 Nov 2011 14:25:30 +0800 Subject: [PATCH] --- yaml --- r: 283131 b: refs/heads/master c: a2eff9dd8bca6d03bc3c87790bac3fdb4fe6dbf0 h: refs/heads/master i: 283129: 64205ab7e4eb96bdedc6a98152880ff0f0f0889f 283127: f953ed9974df8ef44d945708cf128096f1a30891 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-common/smp.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a8f82648809f..8d151511125b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d157fb02bc3f4dc74e6830725864ba501d92da7 +refs/heads/master: a2eff9dd8bca6d03bc3c87790bac3fdb4fe6dbf0 diff --git a/trunk/arch/blackfin/mach-common/smp.c b/trunk/arch/blackfin/mach-common/smp.c index d3464053dfdb..ac8f8a43158c 100644 --- a/trunk/arch/blackfin/mach-common/smp.c +++ b/trunk/arch/blackfin/mach-common/smp.c @@ -193,14 +193,10 @@ static irqreturn_t ipi_handler_int1(int irq, void *dev_instance) scheduler_ipi(); break; case BFIN_IPI_CALL_FUNC: - spin_unlock_irqrestore(&msg_queue->lock, flags); ipi_call_function(cpu, msg); - spin_lock_irqsave(&msg_queue->lock, flags); break; case BFIN_IPI_CPU_STOP: - spin_unlock_irqrestore(&msg_queue->lock, flags); ipi_cpu_stop(cpu); - spin_lock_irqsave(&msg_queue->lock, flags); break; default: printk(KERN_CRIT "CPU%u: Unknown IPI message 0x%lx\n", @@ -482,8 +478,10 @@ void smp_icache_flush_range_others(unsigned long start, unsigned long end) smp_flush_data.start = start; smp_flush_data.end = end; - if (smp_call_function(&ipi_flush_icache, &smp_flush_data, 0)) + preempt_disable(); + if (smp_call_function(&ipi_flush_icache, &smp_flush_data, 1)) printk(KERN_WARNING "SMP: failed to run I-cache flush request on other CPUs\n"); + preempt_enable(); } EXPORT_SYMBOL_GPL(smp_icache_flush_range_others);