Merge branch 'ost' into release

[mirror_ubuntu-bionic-kernel.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index 1415dc4598aef6f1824382c3a4c5859d82e574fd..9bd91447e052dc381eafa32a19af9d3d5b21bab1 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -939,9 +939,9 @@ SYSCALL_DEFINE1(set_tid_address, int __user *, tidptr)
 
 static void rt_mutex_init_task(struct task_struct *p)
 {
-       spin_lock_init(&p->pi_lock);
+       raw_spin_lock_init(&p->pi_lock);
 #ifdef CONFIG_RT_MUTEXES
-       plist_head_init(&p->pi_waiters, &p->pi_lock);
+       plist_head_init_raw(&p->pi_waiters, &p->pi_lock);
        p->pi_blocked_on = NULL;
 #endif
 }