diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-12 11:21:35 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-12 11:21:35 +0200 |
| commit | 6652dba0fc40f7f8eab0fa4b837c5ff6230d77c4 (patch) | |
| tree | 7a4519249b562aa1fbfd121fc4d478493ec8570e /arch | |
| parent | e57542b073b261817a7e8ff1e19630b6f53cf187 (diff) | |
| parent | 7f5ea4e1329ee637bcc768a6c6c7eba764ebfb5a (diff) | |
| download | lwn-6652dba0fc40f7f8eab0fa4b837c5ff6230d77c4.tar.gz lwn-6652dba0fc40f7f8eab0fa4b837c5ff6230d77c4.zip | |
Merge branch 'rt/atomic-locks' into rt/base
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/mach/irq.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-msm/proc_comm.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h index acac5302e4ea..3981cf294d40 100644 --- a/arch/arm/include/asm/mach/irq.h +++ b/arch/arm/include/asm/mach/irq.h @@ -26,9 +26,9 @@ extern int show_fiq_list(struct seq_file *, void *); */ #define do_bad_IRQ(irq,desc) \ do { \ - spin_lock(&desc->lock); \ + atomic_spin_lock(&desc->lock); \ handle_bad_irq(irq, desc); \ - spin_unlock(&desc->lock); \ + atomic_spin_unlock(&desc->lock); \ } while(0) #endif diff --git a/arch/arm/mach-msm/proc_comm.c b/arch/arm/mach-msm/proc_comm.c index 915ee704ed3c..e825c36d3ea6 100644 --- a/arch/arm/mach-msm/proc_comm.c +++ b/arch/arm/mach-msm/proc_comm.c @@ -14,6 +14,7 @@ * */ +#include <linux/cache.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/io.h> |