diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
| commit | a448bfbd8e15bb2ed380a75f20adeb6e8d752abb (patch) | |
| tree | 1ab81f3867a5f7e0e9a6cc06fac678d670c2d464 /include/linux/rtmutex.h | |
| parent | 2aced4d6099ce987233ab2ffad42b90800dadf09 (diff) | |
| parent | 0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0 (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'include/linux/rtmutex.h')
| -rw-r--r-- | include/linux/rtmutex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h index 8d522ffeda3..de17134244f 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h @@ -66,7 +66,7 @@ struct hrtimer_sleeper; #define __RT_MUTEX_INITIALIZER(mutexname) \ { .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \ - , .wait_list = PLIST_HEAD_INIT_RAW(mutexname.wait_list, mutexname.wait_lock) \ + , .wait_list = PLIST_HEAD_INIT(mutexname.wait_list) \ , .owner = NULL \ __DEBUG_RT_MUTEX_INITIALIZER(mutexname)} @@ -100,7 +100,7 @@ extern void rt_mutex_unlock(struct rt_mutex *lock); #ifdef CONFIG_RT_MUTEXES # define INIT_RT_MUTEXES(tsk) \ - .pi_waiters = PLIST_HEAD_INIT(tsk.pi_waiters, tsk.pi_lock), \ + .pi_waiters = PLIST_HEAD_INIT(tsk.pi_waiters), \ INIT_RT_MUTEX_DEBUG(tsk) #else # define INIT_RT_MUTEXES(tsk) |