Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7054
b: refs/heads/master
c: 9513e5e
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Carstens authored and Linus Torvalds committed Sep 5, 2005
1 parent 795946f commit 73b3b7b
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: c563077e526d130b8c9aab4e75116551eb5fdc2d
refs/heads/master: 9513e5e3f5a6b429da8a9fd4330f71f1e547c8e0
4 changes: 2 additions & 2 deletions trunk/include/asm-s390/spinlock.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ extern int _raw_spin_trylock_retry(spinlock_t *lp, unsigned int pc);

static inline void _raw_spin_lock(spinlock_t *lp)
{
unsigned long pc = (unsigned long) __builtin_return_address(0);
unsigned long pc = 1 | (unsigned long) __builtin_return_address(0);

if (unlikely(_raw_compare_and_swap(&lp->lock, 0, pc) != 0))
_raw_spin_lock_wait(lp, pc);
}

static inline int _raw_spin_trylock(spinlock_t *lp)
{
unsigned long pc = (unsigned long) __builtin_return_address(0);
unsigned long pc = 1 | (unsigned long) __builtin_return_address(0);

if (likely(_raw_compare_and_swap(&lp->lock, 0, pc) == 0))
return 1;
Expand Down

0 comments on commit 73b3b7b

Please sign in to comment.