diff options
Diffstat (limited to 'arch/alpha/kernel/semaphore.c')
-rw-r--r-- | arch/alpha/kernel/semaphore.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/alpha/kernel/semaphore.c b/arch/alpha/kernel/semaphore.c index 8c8aaa205eae..8d2982aa1b8d 100644 --- a/arch/alpha/kernel/semaphore.c +++ b/arch/alpha/kernel/semaphore.c | |||
@@ -69,7 +69,7 @@ __down_failed(struct semaphore *sem) | |||
69 | 69 | ||
70 | #ifdef CONFIG_DEBUG_SEMAPHORE | 70 | #ifdef CONFIG_DEBUG_SEMAPHORE |
71 | printk("%s(%d): down failed(%p)\n", | 71 | printk("%s(%d): down failed(%p)\n", |
72 | tsk->comm, tsk->pid, sem); | 72 | tsk->comm, task_pid_nr(tsk), sem); |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | tsk->state = TASK_UNINTERRUPTIBLE; | 75 | tsk->state = TASK_UNINTERRUPTIBLE; |
@@ -98,7 +98,7 @@ __down_failed(struct semaphore *sem) | |||
98 | 98 | ||
99 | #ifdef CONFIG_DEBUG_SEMAPHORE | 99 | #ifdef CONFIG_DEBUG_SEMAPHORE |
100 | printk("%s(%d): down acquired(%p)\n", | 100 | printk("%s(%d): down acquired(%p)\n", |
101 | tsk->comm, tsk->pid, sem); | 101 | tsk->comm, task_pid_nr(tsk), sem); |
102 | #endif | 102 | #endif |
103 | } | 103 | } |
104 | 104 | ||
@@ -111,7 +111,7 @@ __down_failed_interruptible(struct semaphore *sem) | |||
111 | 111 | ||
112 | #ifdef CONFIG_DEBUG_SEMAPHORE | 112 | #ifdef CONFIG_DEBUG_SEMAPHORE |
113 | printk("%s(%d): down failed(%p)\n", | 113 | printk("%s(%d): down failed(%p)\n", |
114 | tsk->comm, tsk->pid, sem); | 114 | tsk->comm, task_pid_nr(tsk), sem); |
115 | #endif | 115 | #endif |
116 | 116 | ||
117 | tsk->state = TASK_INTERRUPTIBLE; | 117 | tsk->state = TASK_INTERRUPTIBLE; |
@@ -139,7 +139,7 @@ __down_failed_interruptible(struct semaphore *sem) | |||
139 | 139 | ||
140 | #ifdef CONFIG_DEBUG_SEMAPHORE | 140 | #ifdef CONFIG_DEBUG_SEMAPHORE |
141 | printk("%s(%d): down %s(%p)\n", | 141 | printk("%s(%d): down %s(%p)\n", |
142 | current->comm, current->pid, | 142 | current->comm, task_pid_nr(current), |
143 | (ret < 0 ? "interrupted" : "acquired"), sem); | 143 | (ret < 0 ? "interrupted" : "acquired"), sem); |
144 | #endif | 144 | #endif |
145 | return ret; | 145 | return ret; |
@@ -168,7 +168,7 @@ down(struct semaphore *sem) | |||
168 | #endif | 168 | #endif |
169 | #ifdef CONFIG_DEBUG_SEMAPHORE | 169 | #ifdef CONFIG_DEBUG_SEMAPHORE |
170 | printk("%s(%d): down(%p) <count=%d> from %p\n", | 170 | printk("%s(%d): down(%p) <count=%d> from %p\n", |
171 | current->comm, current->pid, sem, | 171 | current->comm, task_pid_nr(current), sem, |
172 | atomic_read(&sem->count), __builtin_return_address(0)); | 172 | atomic_read(&sem->count), __builtin_return_address(0)); |
173 | #endif | 173 | #endif |
174 | __down(sem); | 174 | __down(sem); |
@@ -182,7 +182,7 @@ down_interruptible(struct semaphore *sem) | |||
182 | #endif | 182 | #endif |
183 | #ifdef CONFIG_DEBUG_SEMAPHORE | 183 | #ifdef CONFIG_DEBUG_SEMAPHORE |
184 | printk("%s(%d): down(%p) <count=%d> from %p\n", | 184 | printk("%s(%d): down(%p) <count=%d> from %p\n", |
185 | current->comm, current->pid, sem, | 185 | current->comm, task_pid_nr(current), sem, |
186 | atomic_read(&sem->count), __builtin_return_address(0)); | 186 | atomic_read(&sem->count), __builtin_return_address(0)); |
187 | #endif | 187 | #endif |
188 | return __down_interruptible(sem); | 188 | return __down_interruptible(sem); |
@@ -201,7 +201,7 @@ down_trylock(struct semaphore *sem) | |||
201 | 201 | ||
202 | #ifdef CONFIG_DEBUG_SEMAPHORE | 202 | #ifdef CONFIG_DEBUG_SEMAPHORE |
203 | printk("%s(%d): down_trylock %s from %p\n", | 203 | printk("%s(%d): down_trylock %s from %p\n", |
204 | current->comm, current->pid, | 204 | current->comm, task_pid_nr(current), |
205 | ret ? "failed" : "acquired", | 205 | ret ? "failed" : "acquired", |
206 | __builtin_return_address(0)); | 206 | __builtin_return_address(0)); |
207 | #endif | 207 | #endif |
@@ -217,7 +217,7 @@ up(struct semaphore *sem) | |||
217 | #endif | 217 | #endif |
218 | #ifdef CONFIG_DEBUG_SEMAPHORE | 218 | #ifdef CONFIG_DEBUG_SEMAPHORE |
219 | printk("%s(%d): up(%p) <count=%d> from %p\n", | 219 | printk("%s(%d): up(%p) <count=%d> from %p\n", |
220 | current->comm, current->pid, sem, | 220 | current->comm, task_pid_nr(current), sem, |
221 | atomic_read(&sem->count), __builtin_return_address(0)); | 221 | atomic_read(&sem->count), __builtin_return_address(0)); |
222 | #endif | 222 | #endif |
223 | __up(sem); | 223 | __up(sem); |