Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262406
b: refs/heads/master
c: 548c210
h: refs/heads/master
v: v3
  • Loading branch information
John David Anglin authored and James Bottomley committed Jul 29, 2011
1 parent 5e1e0d6 commit f364696
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: d9ba5fe76d604514444b1ea0a19f38c6196a46e3
refs/heads/master: 548c210fbffdb008a80fa41ff0cb3965f185583d
4 changes: 2 additions & 2 deletions trunk/arch/parisc/include/asm/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,10 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

#define ATOMIC64_INIT(i) ((atomic64_t) { (i) })

static __inline__ int
static __inline__ s64
__atomic64_add_return(s64 i, atomic64_t *v)
{
int ret;
s64 ret;
unsigned long flags;
_atomic_spin_lock_irqsave(v, flags);

Expand Down

0 comments on commit f364696

Please sign in to comment.