diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
| commit | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (patch) | |
| tree | e900ad4c0beb4f44f0912b847c3319f11ef57d73 /arch/sparc/lib | |
| parent | 451ec6ab310602515b361418debe93d00f67e273 (diff) | |
| parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/sparc/lib')
| -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 cb3cf0f2282..de84f8534ba 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 | { |