Skip to content

L
linux-davinci
Commit 6652dba0 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

Merge branch 'rt/atomic-locks' into rt/base

parents e57542b0 7f5ea4e1
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
arch/arm/include/asm/mach/irq.h
View file @ 6652dba0
...@@ -26,9 +26,9 @@ extern int show_fiq_list(struct seq_file *, void *); ...@@ -26,9 +26,9 @@ extern int show_fiq_list(struct seq_file *, void *);
*/ */
#define do_bad_IRQ(irq,desc) \ #define do_bad_IRQ(irq,desc) \
do { \ do { \
spin_lock(&desc->lock); \ atomic_spin_lock(&desc->lock); \
handle_bad_irq(irq, desc); \ handle_bad_irq(irq, desc); \
spin_unlock(&desc->lock); \ atomic_spin_unlock(&desc->lock); \
} while(0) } while(0)
#endif #endif
arch/arm/mach-msm/proc_comm.c
View file @ 6652dba0
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* *
*/ */
#include <linux/cache.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/io.h> #include <linux/io.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment