diff options
author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
tree | 7ca46caa910012d75617700e4083b3657053cb31 /kernel/rtmutex-debug.c | |
parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'kernel/rtmutex-debug.c')
-rw-r--r-- | kernel/rtmutex-debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rtmutex-debug.c b/kernel/rtmutex-debug.c index 5fcb4fe645e2..ddabb54bb5c8 100644 --- a/kernel/rtmutex-debug.c +++ b/kernel/rtmutex-debug.c | |||
@@ -37,8 +37,8 @@ do { \ | |||
37 | if (rt_trace_on) { \ | 37 | if (rt_trace_on) { \ |
38 | rt_trace_on = 0; \ | 38 | rt_trace_on = 0; \ |
39 | console_verbose(); \ | 39 | console_verbose(); \ |
40 | if (spin_is_locked(¤t->pi_lock)) \ | 40 | if (raw_spin_is_locked(¤t->pi_lock)) \ |
41 | spin_unlock(¤t->pi_lock); \ | 41 | raw_spin_unlock(¤t->pi_lock); \ |
42 | } \ | 42 | } \ |
43 | } while (0) | 43 | } while (0) |
44 | 44 | ||