Merge e2dc495734 ("Merge tag 'asm-generic-cleanup-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline
Steps on the way to 5.11-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I937a4454849ec8dd9c098a0a96f09710ed88e1fe
This commit is contained in:
@@ -1228,7 +1228,7 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
|
||||
struct mm_struct *mm;
|
||||
int err;
|
||||
|
||||
err = mutex_lock_killable(&task->signal->exec_update_mutex);
|
||||
err = down_read_killable(&task->signal->exec_update_lock);
|
||||
if (err)
|
||||
return ERR_PTR(err);
|
||||
|
||||
@@ -1238,7 +1238,7 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
|
||||
mmput(mm);
|
||||
mm = ERR_PTR(-EACCES);
|
||||
}
|
||||
mutex_unlock(&task->signal->exec_update_mutex);
|
||||
up_read(&task->signal->exec_update_lock);
|
||||
|
||||
return mm;
|
||||
}
|
||||
@@ -1598,7 +1598,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
|
||||
sig->oom_score_adj_min = current->signal->oom_score_adj_min;
|
||||
|
||||
mutex_init(&sig->cred_guard_mutex);
|
||||
mutex_init(&sig->exec_update_mutex);
|
||||
init_rwsem(&sig->exec_update_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user