git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull remove-hotkey into release branch
[pandora-kernel.git]
/
kernel
/
rtmutex-debug.c
diff --git
a/kernel/rtmutex-debug.c
b/kernel/rtmutex-debug.c
index
353a853
..
da8d6bf
100644
(file)
--- a/
kernel/rtmutex-debug.c
+++ b/
kernel/rtmutex-debug.c
@@
-16,7
+16,6
@@
*
* See rt.c in preempt-rt for proper credits and further information
*/
*
* See rt.c in preempt-rt for proper credits and further information
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/module.h>
@@
-96,7
+95,7
@@
void deadlock_trace_off(void)
rt_trace_on = 0;
}
rt_trace_on = 0;
}
-static void printk_task(
task_
t *p)
+static void printk_task(
struct task_struc
t *p)
{
if (p)
printk("%16s:%5d [%p, %3d]", p->comm, p->pid, p, p->prio);
{
if (p)
printk("%16s:%5d [%p, %3d]", p->comm, p->pid, p, p->prio);
@@
-231,7
+230,8
@@
void debug_rt_mutex_init(struct rt_mutex *lock, const char *name)
lock->name = name;
}
lock->name = name;
}
-void rt_mutex_deadlock_account_lock(struct rt_mutex *lock, task_t *task)
+void
+rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task)
{
}
{
}