summaryrefslogtreecommitdiffstats
path: root/kernel/mutex.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-05-20 20:06:24 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-05-20 20:08:05 +0200
commit250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch)
tree007393a6fc6439af7e0121dd99a6f9f9fb8405bc /kernel/mutex.h
parentclockevents: Move C3 stop test outside lock (diff)
parentMAINTAINERS: Add drivers/clocksource to TIMEKEEPING (diff)
downloadlinux-250f972d85effad5b6e10da4bbd877e6a4b503b6.tar.xz
linux-250f972d85effad5b6e10da4bbd877e6a4b503b6.zip
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a follow up patch. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/mutex.h')
-rw-r--r--kernel/mutex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex.h b/kernel/mutex.h
index 67578ca48f94..4115fbf83b12 100644
--- a/kernel/mutex.h
+++ b/kernel/mutex.h
@@ -19,7 +19,7 @@
#ifdef CONFIG_SMP
static inline void mutex_set_owner(struct mutex *lock)
{
- lock->owner = current_thread_info();
+ lock->owner = current;
}
static inline void mutex_clear_owner(struct mutex *lock)