diff options
Diffstat (limited to 'arch/mips/include/asm')
-rw-r--r-- | arch/mips/include/asm/atomic.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/hw_irq.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/local.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/smp.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index 4a02fe891ab..833a4023648 100644 --- a/arch/mips/include/asm/atomic.h +++ b/arch/mips/include/asm/atomic.h | |||
@@ -325,7 +325,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | |||
325 | } | 325 | } |
326 | return c != (u); | 326 | return c != (u); |
327 | } | 327 | } |
328 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) | ||
329 | 328 | ||
330 | #define atomic_dec_return(v) atomic_sub_return(1, (v)) | 329 | #define atomic_dec_return(v) atomic_sub_return(1, (v)) |
331 | #define atomic_inc_return(v) atomic_add_return(1, (v)) | 330 | #define atomic_inc_return(v) atomic_add_return(1, (v)) |
diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h index 77adda297ad..9e8ef5994c9 100644 --- a/arch/mips/include/asm/hw_irq.h +++ b/arch/mips/include/asm/hw_irq.h | |||
@@ -8,7 +8,7 @@ | |||
8 | #ifndef __ASM_HW_IRQ_H | 8 | #ifndef __ASM_HW_IRQ_H |
9 | #define __ASM_HW_IRQ_H | 9 | #define __ASM_HW_IRQ_H |
10 | 10 | ||
11 | #include <asm/atomic.h> | 11 | #include <linux/atomic.h> |
12 | 12 | ||
13 | extern atomic_t irq_err_count; | 13 | extern atomic_t irq_err_count; |
14 | 14 | ||
diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h index fffc8307a80..94fde8d0fac 100644 --- a/arch/mips/include/asm/local.h +++ b/arch/mips/include/asm/local.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/percpu.h> | 4 | #include <linux/percpu.h> |
5 | #include <linux/bitops.h> | 5 | #include <linux/bitops.h> |
6 | #include <asm/atomic.h> | 6 | #include <linux/atomic.h> |
7 | #include <asm/cmpxchg.h> | 7 | #include <asm/cmpxchg.h> |
8 | #include <asm/war.h> | 8 | #include <asm/war.h> |
9 | 9 | ||
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h index af42385245d..d4fb4d852a6 100644 --- a/arch/mips/include/asm/smp.h +++ b/arch/mips/include/asm/smp.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/threads.h> | 17 | #include <linux/threads.h> |
18 | #include <linux/cpumask.h> | 18 | #include <linux/cpumask.h> |
19 | 19 | ||
20 | #include <asm/atomic.h> | 20 | #include <linux/atomic.h> |
21 | #include <asm/smp-ops.h> | 21 | #include <asm/smp-ops.h> |
22 | 22 | ||
23 | extern int smp_num_siblings; | 23 | extern int smp_num_siblings; |