fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / alpha / kernel / semaphore.c

diff --git a/arch/alpha/kernel/semaphore.c b/arch/alpha/kernel/semaphore.c
index 4d60a0c..bb23332 100644 (file)
--- a/arch/alpha/kernel/semaphore.c
+++ b/arch/alpha/kernel/semaphore.c
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
        DECLARE_WAITQUEUE(wait, tsk);
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
-       printk("%s(%d): down failed(%p)\n",
-              tsk->comm, tsk->pid, sem);
+       printk("%s(%d:#%u): down failed(%p)\n",
+              tsk->comm, tsk->pid, tsk->xid, sem);
 #endif
 
        tsk->state = TASK_UNINTERRUPTIBLE;
@@ -97,8 +97,8 @@ __down_failed(struct semaphore *sem)
        wake_up(&sem->wait);
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
-       printk("%s(%d): down acquired(%p)\n",
-              tsk->comm, tsk->pid, sem);
+       printk("%s(%d:#%u): down acquired(%p)\n",
+              tsk->comm, tsk->pid, tsk->xid, sem);
 #endif
 }
 
@@ -110,8 +110,8 @@ __down_failed_interruptible(struct semaphore *sem)
        long ret = 0;
 
 #ifdef CONFIG_DEBUG_SEMAPHORE
-       printk("%s(%d): down failed(%p)\n",
-              tsk->comm, tsk->pid, sem);
+       printk("%s(%d:#%u): down failed(%p)\n",
+              tsk->comm, tsk->pid, tsk->xid, sem);
 #endif
 
        tsk->state = TASK_INTERRUPTIBLE;
@@ -163,7 +163,7 @@ __up_wakeup(struct semaphore *sem)
 void __sched
 down(struct semaphore *sem)
 {
-#if WAITQUEUE_DEBUG
+#ifdef WAITQUEUE_DEBUG
        CHECK_MAGIC(sem->__magic);
 #endif
 #ifdef CONFIG_DEBUG_SEMAPHORE
@@ -177,7 +177,7 @@ down(struct semaphore *sem)
 int __sched
 down_interruptible(struct semaphore *sem)
 {
-#if WAITQUEUE_DEBUG
+#ifdef WAITQUEUE_DEBUG
        CHECK_MAGIC(sem->__magic);
 #endif
 #ifdef CONFIG_DEBUG_SEMAPHORE
@@ -193,7 +193,7 @@ down_trylock(struct semaphore *sem)
 {
        int ret;
 
-#if WAITQUEUE_DEBUG
+#ifdef WAITQUEUE_DEBUG
        CHECK_MAGIC(sem->__magic);
 #endif
 
@@ -212,7 +212,7 @@ down_trylock(struct semaphore *sem)
 void
 up(struct semaphore *sem)
 {
-#if WAITQUEUE_DEBUG
+#ifdef WAITQUEUE_DEBUG
        CHECK_MAGIC(sem->__magic);
 #endif
 #ifdef CONFIG_DEBUG_SEMAPHORE