projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-2.6-block.git]
/
lib
/
rwsem.c
diff --git
a/lib/rwsem.c
b/lib/rwsem.c
index cdb4e3d0560733c2706a27ccd20681017da2e34a..3e3365e5665eebf950803b34411f386681157533 100644
(file)
--- a/
lib/rwsem.c
+++ b/
lib/rwsem.c
@@
-146,7
+146,7
@@
__rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
/*
* wait for a lock to be granted
*/
/*
* wait for a lock to be granted
*/
-static struct rw_semaphore *
+static struct rw_semaphore
__sched
*
rwsem_down_failed_common(struct rw_semaphore *sem,
struct rwsem_waiter *waiter, signed long adjustment)
{
rwsem_down_failed_common(struct rw_semaphore *sem,
struct rwsem_waiter *waiter, signed long adjustment)
{
@@
-187,7
+187,7
@@
rwsem_down_failed_common(struct rw_semaphore *sem,
/*
* wait for the read lock to be granted
*/
/*
* wait for the read lock to be granted
*/
-
struct rw_semaphore fastcall
__sched *
+
asmregparm struct rw_semaphore
__sched *
rwsem_down_read_failed(struct rw_semaphore *sem)
{
struct rwsem_waiter waiter;
rwsem_down_read_failed(struct rw_semaphore *sem)
{
struct rwsem_waiter waiter;
@@
-201,7
+201,7
@@
rwsem_down_read_failed(struct rw_semaphore *sem)
/*
* wait for the write lock to be granted
*/
/*
* wait for the write lock to be granted
*/
-
struct rw_semaphore fastcall
__sched *
+
asmregparm struct rw_semaphore
__sched *
rwsem_down_write_failed(struct rw_semaphore *sem)
{
struct rwsem_waiter waiter;
rwsem_down_write_failed(struct rw_semaphore *sem)
{
struct rwsem_waiter waiter;
@@
-216,7
+216,7
@@
rwsem_down_write_failed(struct rw_semaphore *sem)
* handle waking up a waiter on the semaphore
* - up_read/up_write has decremented the active part of count if we come here
*/
* handle waking up a waiter on the semaphore
* - up_read/up_write has decremented the active part of count if we come here
*/
-
struct rw_semaphore fastcall
*rwsem_wake(struct rw_semaphore *sem)
+
asmregparm struct rw_semaphore
*rwsem_wake(struct rw_semaphore *sem)
{
unsigned long flags;
{
unsigned long flags;
@@
-236,7
+236,7
@@
struct rw_semaphore fastcall *rwsem_wake(struct rw_semaphore *sem)
* - caller incremented waiting part of count and discovered it still negative
* - just wake up any readers at the front of the queue
*/
* - caller incremented waiting part of count and discovered it still negative
* - just wake up any readers at the front of the queue
*/
-
struct rw_semaphore fastcall
*rwsem_downgrade_wake(struct rw_semaphore *sem)
+
asmregparm struct rw_semaphore
*rwsem_downgrade_wake(struct rw_semaphore *sem)
{
unsigned long flags;
{
unsigned long flags;