diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-06 15:07:12 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-03-06 15:07:12 +0800 |
| commit | 4becc339ef23d54b39139a85bb6e33b7f27d67d1 (patch) | |
| tree | 583571dd15b19d2e0592e15ff5ffee6e9c24ab6c /arch/arm/kernel | |
| parent | f072008f5a29068baa0bc1febad8aaf2840e2568 (diff) | |
| parent | 180c995fa9dfd1912e199d908ae55b2b8c479d13 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Conflicts:
drivers/video/mxc/ldb.c
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index c132e8145754..478e2a7cd721 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -235,7 +235,7 @@ void cpu_idle(void) #ifdef CONFIG_PL310_ERRATA_769419 wmb(); #endif - if (hlt_counter) { + if (hlt_counter || tick_check_broadcast_pending()) { local_irq_enable(); cpu_relax(); } else { |