diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
| commit | da8543ef125afc7bba4da526b61a1ae07dc25109 (patch) | |
| tree | 6aec5867f8e054c22c6208032280ed1434c14a58 /arch/sparc/lib/atomic32.c | |
| parent | ec637e3ffb6b978143652477c7c5f96c9519b691 (diff) | |
| parent | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/sparc/lib/atomic32.c')
| -rw-r--r-- | arch/sparc/lib/atomic32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c index cb3cf0f22822..de84f8534bac 100644 --- a/arch/sparc/lib/atomic32.c +++ b/arch/sparc/lib/atomic32.c | |||
| @@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u) | |||
| 66 | return ret != u; | 66 | return ret != u; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | ||
| 70 | /* Atomic operations are already serializing */ | 69 | /* Atomic operations are already serializing */ |
| 71 | void atomic_set(atomic_t *v, int i) | 70 | void atomic_set(atomic_t *v, int i) |
| 72 | { | 71 | { |