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
vserver 1.9.3
[linux-2.6.git]
/
include
/
asm-arm
/
semaphore.h
diff --git
a/include/asm-arm/semaphore.h
b/include/asm-arm/semaphore.h
index
2e47880
..
60f33e6
100644
(file)
--- a/
include/asm-arm/semaphore.h
+++ b/
include/asm-arm/semaphore.h
@@
-16,21
+16,12
@@
struct semaphore {
atomic_t count;
int sleepers;
wait_queue_head_t wait;
atomic_t count;
int sleepers;
wait_queue_head_t wait;
-#ifdef WAITQUEUE_DEBUG
- long __magic;
-#endif
};
};
-#ifdef WAITQUEUE_DEBUG
-# define __SEM_DEBUG_INIT(name) .__magic = (long)&(name).__magic
-#else
-# define __SEM_DEBUG_INIT(name)
-#endif
-
-#define __SEMAPHORE_INIT(name,cnt) { \
+#define __SEMAPHORE_INIT(name, cnt) \
+{ \
.count = ATOMIC_INIT(cnt), \
.wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \
.count = ATOMIC_INIT(cnt), \
.wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \
- __SEM_DEBUG_INIT(name) \
}
#define __MUTEX_INITIALIZER(name) __SEMAPHORE_INIT(name,1)
}
#define __MUTEX_INITIALIZER(name) __SEMAPHORE_INIT(name,1)
@@
-46,9
+37,6
@@
static inline void sema_init(struct semaphore *sem, int val)
atomic_set(&sem->count, val);
sem->sleepers = 0;
init_waitqueue_head(&sem->wait);
atomic_set(&sem->count, val);
sem->sleepers = 0;
init_waitqueue_head(&sem->wait);
-#ifdef WAITQUEUE_DEBUG
- sem->__magic = (long)&sem->__magic;
-#endif
}
static inline void init_MUTEX(struct semaphore *sem)
}
static inline void init_MUTEX(struct semaphore *sem)
@@
-85,9
+73,6
@@
extern void __up(struct semaphore * sem);
*/
static inline void down(struct semaphore * sem)
{
*/
static inline void down(struct semaphore * sem)
{
-#ifdef WAITQUEUE_DEBUG
- CHECK_MAGIC(sem->__magic);
-#endif
might_sleep();
__down_op(sem, __down_failed);
}
might_sleep();
__down_op(sem, __down_failed);
}
@@
-98,19
+83,12
@@
static inline void down(struct semaphore * sem)
*/
static inline int down_interruptible (struct semaphore * sem)
{
*/
static inline int down_interruptible (struct semaphore * sem)
{
-#ifdef WAITQUEUE_DEBUG
- CHECK_MAGIC(sem->__magic);
-#endif
might_sleep();
return __down_op_ret(sem, __down_interruptible_failed);
}
static inline int down_trylock(struct semaphore *sem)
{
might_sleep();
return __down_op_ret(sem, __down_interruptible_failed);
}
static inline int down_trylock(struct semaphore *sem)
{
-#ifdef WAITQUEUE_DEBUG
- CHECK_MAGIC(sem->__magic);
-#endif
-
return __down_op_ret(sem, __down_trylock_failed);
}
return __down_op_ret(sem, __down_trylock_failed);
}
@@
-122,10
+100,6
@@
static inline int down_trylock(struct semaphore *sem)
*/
static inline void up(struct semaphore * sem)
{
*/
static inline void up(struct semaphore * sem)
{
-#ifdef WAITQUEUE_DEBUG
- CHECK_MAGIC(sem->__magic);
-#endif
-
__up_op(sem, __up_wakeup);
}
__up_op(sem, __up_wakeup);
}