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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
asm-x86_64
/
semaphore.h
diff --git
a/include/asm-x86_64/semaphore.h
b/include/asm-x86_64/semaphore.h
index
5fe2548
..
2788834
100644
(file)
--- a/
include/asm-x86_64/semaphore.h
+++ b/
include/asm-x86_64/semaphore.h
@@
-47,12
+47,12
@@
struct semaphore {
atomic_t count;
int sleepers;
wait_queue_head_t wait;
atomic_t count;
int sleepers;
wait_queue_head_t wait;
-#if WAITQUEUE_DEBUG
+#if
def
WAITQUEUE_DEBUG
long __magic;
#endif
};
long __magic;
#endif
};
-#if WAITQUEUE_DEBUG
+#if
def
WAITQUEUE_DEBUG
# define __SEM_DEBUG_INIT(name) \
, (int)&(name).__magic
#else
# define __SEM_DEBUG_INIT(name) \
, (int)&(name).__magic
#else
@@
-83,7
+83,7
@@
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);
-#if WAITQUEUE_DEBUG
+#if
def
WAITQUEUE_DEBUG
sem->__magic = (int)&sem->__magic;
#endif
}
sem->__magic = (int)&sem->__magic;
#endif
}
@@
-115,7
+115,7
@@
asmlinkage void __up(struct semaphore * sem);
*/
static inline void down(struct semaphore * sem)
{
*/
static inline void down(struct semaphore * sem)
{
-#if WAITQUEUE_DEBUG
+#if
def
WAITQUEUE_DEBUG
CHECK_MAGIC(sem->__magic);
#endif
might_sleep();
CHECK_MAGIC(sem->__magic);
#endif
might_sleep();
@@
-142,7
+142,7
@@
static inline int down_interruptible(struct semaphore * sem)
{
int result;
{
int result;
-#if WAITQUEUE_DEBUG
+#if
def
WAITQUEUE_DEBUG
CHECK_MAGIC(sem->__magic);
#endif
might_sleep();
CHECK_MAGIC(sem->__magic);
#endif
might_sleep();
@@
-171,7
+171,7
@@
static inline int down_trylock(struct semaphore * sem)
{
int result;
{
int result;
-#if WAITQUEUE_DEBUG
+#if
def
WAITQUEUE_DEBUG
CHECK_MAGIC(sem->__magic);
#endif
CHECK_MAGIC(sem->__magic);
#endif
@@
-199,7
+199,7
@@
static inline int down_trylock(struct semaphore * sem)
*/
static inline void up(struct semaphore * sem)
{
*/
static inline void up(struct semaphore * sem)
{
-#if WAITQUEUE_DEBUG
+#if
def
WAITQUEUE_DEBUG
CHECK_MAGIC(sem->__magic);
#endif
__asm__ __volatile__(
CHECK_MAGIC(sem->__magic);
#endif
__asm__ __volatile__(