diff options
author | David S. Miller | 2011-12-02 19:49:21 +0100 |
---|---|---|
committer | David S. Miller | 2011-12-02 19:49:21 +0100 |
commit | b3613118eb30a589d971e4eccbbb2a1314f5dfd4 (patch) | |
tree | 868c1ee59e1b5c19a4f2e43716400d0001a994e5 /arch/arm/kernel/process.c | |
parent | forcedeath: Fix bql support for forcedeath (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-b3613118eb30a589d971e4eccbbb2a1314f5dfd4.tar.gz kernel-qcow2-linux-b3613118eb30a589d971e4eccbbb2a1314f5dfd4.tar.xz kernel-qcow2-linux-b3613118eb30a589d971e4eccbbb2a1314f5dfd4.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r-- | arch/arm/kernel/process.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 75316f0dd02a..3d0c6fb74ae4 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -192,6 +192,9 @@ void cpu_idle(void) #endif local_irq_disable(); +#ifdef CONFIG_PL310_ERRATA_769419 + wmb(); +#endif if (hlt_counter) { local_irq_enable(); cpu_relax(); |