projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
rtmutex_common.h
diff --git
a/kernel/rtmutex_common.h
b/kernel/rtmutex_common.h
index 9c75856e791ee91a0e34dbdc0079a8297c9574ff..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;
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
};
struct rt_mutex *deadlock_lock;
#endif
};
@@
-103,7
+103,7
@@
static inline struct task_struct *rt_mutex_owner(struct rt_mutex *lock)
static inline struct task_struct *rt_mutex_real_owner(struct rt_mutex *lock)
{
static inline struct task_struct *rt_mutex_real_owner(struct rt_mutex *lock)
{
- return (struct task_struct *)
+ return (struct task_struct *)
((unsigned long)lock->owner & ~RT_MUTEX_HAS_WAITERS);
}
((unsigned long)lock->owner & ~RT_MUTEX_HAS_WAITERS);
}
@@
-120,4
+120,11
@@
extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
struct task_struct *proxy_owner);
extern void rt_mutex_proxy_unlock(struct rt_mutex *lock,
struct task_struct *proxy_owner);
struct task_struct *proxy_owner);
extern void rt_mutex_proxy_unlock(struct rt_mutex *lock,
struct task_struct *proxy_owner);
+
+#ifdef CONFIG_DEBUG_RT_MUTEXES
+# include "rtmutex-debug.h"
+#else
+# include "rtmutex.h"
+#endif
+
#endif
#endif