Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 260823
b: refs/heads/master
c: 678624e
h: refs/heads/master
i:
  260821: 4c8fbde
  260819: a73b199
  260815: 7604fa2
v: v3
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Jul 27, 2011
1 parent f068380 commit d77c23c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09570f914914d2beb0db29c5a9c7344934f2fa8c
refs/heads/master: 678624e401b0b7747762b5223fb23f86dcdacc93
4 changes: 2 additions & 2 deletions trunk/arch/sparc/lib/atomic32.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int atomic_cmpxchg(atomic_t *v, int old, int new)
}
EXPORT_SYMBOL(atomic_cmpxchg);

int atomic_add_unless(atomic_t *v, int a, int u)
int __atomic_add_unless(atomic_t *v, int a, int u)
{
int ret;
unsigned long flags;
Expand All @@ -67,7 +67,7 @@ int atomic_add_unless(atomic_t *v, int a, int u)
spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
return ret != u;
}
EXPORT_SYMBOL(atomic_add_unless);
EXPORT_SYMBOL(__atomic_add_unless);

/* Atomic operations are already serializing */
void atomic_set(atomic_t *v, int i)
Expand Down

0 comments on commit d77c23c

Please sign in to comment.