diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /lib/rwsem.c | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'lib/rwsem.c')
| -rw-r--r-- | lib/rwsem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rwsem.c b/lib/rwsem.c index cdb4e3d056..7d02700a4b 100644 --- a/lib/rwsem.c +++ b/lib/rwsem.c | |||
| @@ -146,7 +146,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int downgrading) | |||
| 146 | /* | 146 | /* |
| 147 | * wait for a lock to be granted | 147 | * wait for a lock to be granted |
| 148 | */ | 148 | */ |
| 149 | static struct rw_semaphore * | 149 | static struct rw_semaphore __sched * |
| 150 | rwsem_down_failed_common(struct rw_semaphore *sem, | 150 | rwsem_down_failed_common(struct rw_semaphore *sem, |
| 151 | struct rwsem_waiter *waiter, signed long adjustment) | 151 | struct rwsem_waiter *waiter, signed long adjustment) |
| 152 | { | 152 | { |