git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
kernel
/
rtmutex_common.h
diff --git
a/kernel/rtmutex_common.h
b/kernel/rtmutex_common.h
index 2d3b83593ca3232a0414fc8f808e8435376a9d4c..e124bf5800ea140ceeb936c7cba6429fea0e49b5 100644
(file)
--- a/
kernel/rtmutex_common.h
+++ b/
kernel/rtmutex_common.h
@@
-51,7
+51,7
@@
struct rt_mutex_waiter {
struct rt_mutex *lock;
#ifdef CONFIG_DEBUG_RT_MUTEXES
unsigned long ip;
-
pid_t
deadlock_task_pid;
+
struct pid *
deadlock_task_pid;
struct rt_mutex *deadlock_lock;
#endif
};