git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-s390
/
rwsem.h
diff --git
a/include/asm-s390/rwsem.h
b/include/asm-s390/rwsem.h
index
13ec169
..
0422a08
100644
(file)
--- a/
include/asm-s390/rwsem.h
+++ b/
include/asm-s390/rwsem.h
@@
-61,9
+61,6
@@
struct rw_semaphore {
signed long count;
spinlock_t wait_lock;
struct list_head wait_list;
signed long count;
spinlock_t wait_lock;
struct list_head wait_list;
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
- struct lockdep_map dep_map;
-#endif
};
#ifndef __s390x__
};
#ifndef __s390x__
@@
-83,16
+80,8
@@
struct rw_semaphore {
/*
* initialisation
*/
/*
* initialisation
*/
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }
-#else
-# define __RWSEM_DEP_MAP_INIT(lockname)
-#endif
-
#define __RWSEM_INITIALIZER(name) \
#define __RWSEM_INITIALIZER(name) \
-{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) \
- __RWSEM_DEP_MAP_INIT(name) }
+{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) }
#define DECLARE_RWSEM(name) \
struct rw_semaphore name = __RWSEM_INITIALIZER(name)
#define DECLARE_RWSEM(name) \
struct rw_semaphore name = __RWSEM_INITIALIZER(name)
@@
-104,17
+93,6
@@
static inline void init_rwsem(struct rw_semaphore *sem)
INIT_LIST_HEAD(&sem->wait_list);
}
INIT_LIST_HEAD(&sem->wait_list);
}
-extern void __init_rwsem(struct rw_semaphore *sem, const char *name,
- struct lock_class_key *key);
-
-#define init_rwsem(sem) \
-do { \
- static struct lock_class_key __key; \
- \
- __init_rwsem((sem), #sem, &__key); \
-} while (0)
-
-
/*
* lock for reading
*/
/*
* lock for reading
*/
@@
-177,7
+155,7
@@
static inline int __down_read_trylock(struct rw_semaphore *sem)
/*
* lock for writing
*/
/*
* lock for writing
*/
-static inline void __down_write
_nested(struct rw_semaphore *sem, int subclass
)
+static inline void __down_write
(struct rw_semaphore *sem
)
{
signed long old, new, tmp;
{
signed long old, new, tmp;
@@
-203,11
+181,6
@@
static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
rwsem_down_write_failed(sem);
}
rwsem_down_write_failed(sem);
}
-static inline void __down_write(struct rw_semaphore *sem)
-{
- __down_write_nested(sem, 0);
-}
-
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/