diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 17:17:51 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 17:24:28 -0700 |
| commit | b855192c08fcb14adbc5d3a7cab182022d433cca (patch) | |
| tree | 3a10cafbfbf98cafacf667eb218c71300b351bfa /kernel/rtmutex.c | |
| parent | d886c73cd4cf02a71e1650cbcb6176799d78aac1 (diff) | |
| parent | 3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7 (diff) | |
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'kernel/rtmutex.c')
| -rw-r--r-- | kernel/rtmutex.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index fcd107a78c5..29bd4baf9e7 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -1039,16 +1039,14 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, if (!rt_mutex_owner(lock) || try_to_steal_lock(lock, task)) { /* We got the lock for task. */ debug_rt_mutex_lock(lock); - rt_mutex_set_owner(lock, task, 0); - + spin_unlock(&lock->wait_lock); rt_mutex_deadlock_account_lock(lock, task); return 1; } ret = task_blocks_on_rt_mutex(lock, waiter, task, detect_deadlock); - if (ret && !waiter->task) { /* * Reset the return value. We might have |