diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:49:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:49:27 -0500 |
| commit | 94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22 (patch) | |
| tree | c719fbb7e7d44d74b4d7b571f7ed3f0d338daf71 /arch/sparc/lib/atomic32.c | |
| parent | 062dfa433cce9a2c3941b3b8b96ae678f11230fa (diff) | |
| parent | 1df2ab48f995b1599740a3f430df77fe24cb8ce9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
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 | { |