diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /arch/blackfin/include/asm | |
parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'arch/blackfin/include/asm')
-rw-r--r-- | arch/blackfin/include/asm/atomic.h | 8 | ||||
-rw-r--r-- | arch/blackfin/include/asm/dma.h | 2 | ||||
-rw-r--r-- | arch/blackfin/include/asm/ipipe.h | 2 | ||||
-rw-r--r-- | arch/blackfin/include/asm/ptrace.h | 1 | ||||
-rw-r--r-- | arch/blackfin/include/asm/spinlock.h | 2 |
5 files changed, 5 insertions, 10 deletions
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h index 4c707dbe1ff..135225696fd 100644 --- a/arch/blackfin/include/asm/atomic.h +++ b/arch/blackfin/include/asm/atomic.h | |||
@@ -89,15 +89,14 @@ static inline void atomic_set_mask(int mask, atomic_t *v) | |||
89 | #define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) | 89 | #define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) |
90 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) | 90 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) |
91 | 91 | ||
92 | #define atomic_add_unless(v, a, u) \ | 92 | #define __atomic_add_unless(v, a, u) \ |
93 | ({ \ | 93 | ({ \ |
94 | int c, old; \ | 94 | int c, old; \ |
95 | c = atomic_read(v); \ | 95 | c = atomic_read(v); \ |
96 | while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ | 96 | while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ |
97 | c = old; \ | 97 | c = old; \ |
98 | c != (u); \ | 98 | c; \ |
99 | }) | 99 | }) |
100 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) | ||
101 | 100 | ||
102 | /* | 101 | /* |
103 | * atomic_inc_and_test - increment and test | 102 | * atomic_inc_and_test - increment and test |
@@ -112,10 +111,7 @@ static inline void atomic_set_mask(int mask, atomic_t *v) | |||
112 | #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) | 111 | #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) |
113 | #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) | 112 | #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) |
114 | 113 | ||
115 | #include <asm-generic/atomic-long.h> | ||
116 | 114 | ||
117 | #endif | 115 | #endif |
118 | 116 | ||
119 | #include <asm-generic/atomic64.h> | ||
120 | |||
121 | #endif | 117 | #endif |
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h index d9dbc1a5353..dac0c97242b 100644 --- a/arch/blackfin/include/asm/dma.h +++ b/arch/blackfin/include/asm/dma.h | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
12 | #include <mach/dma.h> | 12 | #include <mach/dma.h> |
13 | #include <asm/atomic.h> | 13 | #include <linux/atomic.h> |
14 | #include <asm/blackfin.h> | 14 | #include <asm/blackfin.h> |
15 | #include <asm/page.h> | 15 | #include <asm/page.h> |
16 | #include <asm-generic/dma.h> | 16 | #include <asm-generic/dma.h> |
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h index 9e0cc0e2534..17b5e92e3bc 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/ptrace.h> | 32 | #include <asm/ptrace.h> |
33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
34 | #include <asm/bitops.h> | 34 | #include <asm/bitops.h> |
35 | #include <asm/atomic.h> | 35 | #include <linux/atomic.h> |
36 | #include <asm/traps.h> | 36 | #include <asm/traps.h> |
37 | #include <asm/bitsperlong.h> | 37 | #include <asm/bitsperlong.h> |
38 | 38 | ||
diff --git a/arch/blackfin/include/asm/ptrace.h b/arch/blackfin/include/asm/ptrace.h index 7854d4367c1..10d8641180f 100644 --- a/arch/blackfin/include/asm/ptrace.h +++ b/arch/blackfin/include/asm/ptrace.h | |||
@@ -102,7 +102,6 @@ struct pt_regs { | |||
102 | /* user_mode returns true if only one bit is set in IPEND, other than the | 102 | /* user_mode returns true if only one bit is set in IPEND, other than the |
103 | master interrupt enable. */ | 103 | master interrupt enable. */ |
104 | #define user_mode(regs) (!(((regs)->ipend & ~0x10) & (((regs)->ipend & ~0x10) - 1))) | 104 | #define user_mode(regs) (!(((regs)->ipend & ~0x10) & (((regs)->ipend & ~0x10) - 1))) |
105 | extern void show_regs(struct pt_regs *); | ||
106 | 105 | ||
107 | #define arch_has_single_step() (1) | 106 | #define arch_has_single_step() (1) |
108 | /* common code demands this function */ | 107 | /* common code demands this function */ |
diff --git a/arch/blackfin/include/asm/spinlock.h b/arch/blackfin/include/asm/spinlock.h index 2336093fca2..490c7caa02d 100644 --- a/arch/blackfin/include/asm/spinlock.h +++ b/arch/blackfin/include/asm/spinlock.h | |||
@@ -11,7 +11,7 @@ | |||
11 | # include <asm-generic/spinlock.h> | 11 | # include <asm-generic/spinlock.h> |
12 | #else | 12 | #else |
13 | 13 | ||
14 | #include <asm/atomic.h> | 14 | #include <linux/atomic.h> |
15 | 15 | ||
16 | asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr); | 16 | asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr); |
17 | asmlinkage void __raw_spin_lock_asm(volatile int *ptr); | 17 | asmlinkage void __raw_spin_lock_asm(volatile int *ptr); |