diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
| commit | 72ed73c3f0801e860ee27e53ab6aaf47941ba324 (patch) | |
| tree | b46c546d77ee8931d47dafc97bf23b11472bffeb /kernel/rtmutex-debug.c | |
| parent | 883ae7992c09435927dda642b61f1455fceb5b85 (diff) | |
| parent | bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'kernel/rtmutex-debug.c')
| -rw-r--r-- | kernel/rtmutex-debug.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/rtmutex-debug.c b/kernel/rtmutex-debug.c index ddabb54bb5c8..3c7cbc2c33be 100644 --- a/kernel/rtmutex-debug.c +++ b/kernel/rtmutex-debug.c | |||
| @@ -215,7 +215,6 @@ void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter) | |||
| 215 | put_pid(waiter->deadlock_task_pid); | 215 | put_pid(waiter->deadlock_task_pid); |
| 216 | TRACE_WARN_ON(!plist_node_empty(&waiter->list_entry)); | 216 | TRACE_WARN_ON(!plist_node_empty(&waiter->list_entry)); |
| 217 | TRACE_WARN_ON(!plist_node_empty(&waiter->pi_list_entry)); | 217 | TRACE_WARN_ON(!plist_node_empty(&waiter->pi_list_entry)); |
| 218 | TRACE_WARN_ON(waiter->task); | ||
| 219 | memset(waiter, 0x22, sizeof(*waiter)); | 218 | memset(waiter, 0x22, sizeof(*waiter)); |
| 220 | } | 219 | } |
| 221 | 220 | ||