From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 18 Jul 2012 03:12:45 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
X-Git-Tag: firefly_0821_release~8882^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f30ecbfd21f3a82adab9bc6d7b293c9e5bb23863;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/rtl818x/rtl8187/leds.c
---

f30ecbfd21f3a82adab9bc6d7b293c9e5bb23863
diff --cc arch/arm/kernel/smp.c
index ff956e7d9501,4469924d6832..25f2a7666823
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -636,13 -590,11 +642,15 @@@ asmlinkage void __exception_irq_entry d
  		break;
  
  	case IPI_CPU_STOP:
+ 		irq_enter();
  		ipi_cpu_stop(cpu);
+ 		irq_exit();
  		break;
  
 +	case IPI_CPU_BACKTRACE:
 +		ipi_cpu_backtrace(cpu, regs);
 +		break;
 +
  	default:
  		printk(KERN_CRIT "CPU%u: Unknown IPI message 0x%x\n",
  		       cpu, ipinr);