diff options
| author | David S. Miller | 2011-05-20 22:10:22 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-05-20 22:10:22 +0200 |
| commit | 90d3ac15e5c637d45849e83c828ed78c62886737 (patch) | |
| tree | c5568365f32386559d2710e8981ed41e5fe0eb12 /kernel/mutex-debug.h | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp... (diff) | |
| parent | sched: Move the second half of ttwu() to the remote cpu (diff) | |
| download | kernel-qcow2-linux-90d3ac15e5c637d45849e83c828ed78c62886737.tar.gz kernel-qcow2-linux-90d3ac15e5c637d45849e83c828ed78c62886737.tar.xz kernel-qcow2-linux-90d3ac15e5c637d45849e83c828ed78c62886737.zip | |
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
Conflicts:
arch/sparc/kernel/smp_32.c
With merge conflict help from Daniel Hellstrom.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/mutex-debug.h')
| -rw-r--r-- | kernel/mutex-debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h index 57d527a16f9d..0799fd3e4cfa 100644 --- a/kernel/mutex-debug.h +++ b/kernel/mutex-debug.h @@ -29,7 +29,7 @@ extern void debug_mutex_init(struct mutex *lock, const char *name, 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) |