git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
lib
/
rwsem.c
diff --git
a/lib/rwsem.c
b/lib/rwsem.c
index
901d0e7
..
ceba8e2
100644
(file)
--- a/
lib/rwsem.c
+++ b/
lib/rwsem.c
@@
-19,7
+19,7
@@
void __init_rwsem(struct rw_semaphore *sem, const char *name,
* Make sure we are not reinitializing a held semaphore:
*/
debug_check_no_locks_freed((void *)sem, sizeof(*sem));
* Make sure we are not reinitializing a held semaphore:
*/
debug_check_no_locks_freed((void *)sem, sizeof(*sem));
- lockdep_init_map(&sem->dep_map, name, key);
+ lockdep_init_map(&sem->dep_map, name, key
, 0
);
#endif
sem->count = RWSEM_UNLOCKED_VALUE;
spin_lock_init(&sem->wait_lock);
#endif
sem->count = RWSEM_UNLOCKED_VALUE;
spin_lock_init(&sem->wait_lock);
@@
-136,9
+136,10
@@
__rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
out:
return sem;
out:
return sem;
- /* undo the change to count, but check for a transition 1->0 */
+ /* undo the change to the active count, but check for a transition
+ * 1->0 */
undo:
undo:
- if (rwsem_atomic_update(-RWSEM_ACTIVE_BIAS, sem)
!= 0
)
+ if (rwsem_atomic_update(-RWSEM_ACTIVE_BIAS, sem)
& RWSEM_ACTIVE_MASK
)
goto out;
goto try_again;
}
goto out;
goto try_again;
}
@@
-146,7
+147,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
+188,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
+202,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
+217,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
+237,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;