Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373758
b: refs/heads/master
c: b5f5418
h: refs/heads/master
v: v3
  • Loading branch information
Davidlohr Bueso authored and Linus Torvalds committed May 7, 2013
1 parent f9cbfae commit 6501ae3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 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: a31a369b07cf306ae1de0b2d4a52c3821a570bf6
refs/heads/master: b5f541810ea9fb98d93c0ee0e00e07a22874856f
8 changes: 3 additions & 5 deletions trunk/lib/rwsem.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, enum rwsem_wake_type wake_type)
struct rwsem_waiter *waiter;
struct task_struct *tsk;
struct list_head *next;
signed long oldcount, woken, loop, adjustment;
long oldcount, woken, loop, adjustment;

waiter = list_entry(sem->wait_list.next, struct rwsem_waiter, list);
if (waiter->type == RWSEM_WAITING_FOR_WRITE) {
Expand Down Expand Up @@ -145,10 +145,9 @@ __rwsem_do_wake(struct rw_semaphore *sem, enum rwsem_wake_type wake_type)
*/
struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem)
{
signed long adjustment = -RWSEM_ACTIVE_READ_BIAS;
long count, adjustment = -RWSEM_ACTIVE_READ_BIAS;
struct rwsem_waiter waiter;
struct task_struct *tsk = current;
signed long count;

/* set up my own style of waitqueue */
waiter.task = tsk;
Expand Down Expand Up @@ -193,10 +192,9 @@ struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem)
*/
struct rw_semaphore __sched *rwsem_down_write_failed(struct rw_semaphore *sem)
{
signed long adjustment = -RWSEM_ACTIVE_WRITE_BIAS;
long count, adjustment = -RWSEM_ACTIVE_WRITE_BIAS;
struct rwsem_waiter waiter;
struct task_struct *tsk = current;
signed long count;

/* set up my own style of waitqueue */
waiter.task = tsk;
Expand Down

0 comments on commit 6501ae3

Please sign in to comment.