Merge tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[linux-2.6-microblaze.git] / arch / mips / kernel / mips-mt-fpaff.c

diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
index 1a08428..67e130d 100644 (file)
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -76,13 +76,13 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
        if (copy_from_user(&new_mask, user_mask_ptr, sizeof(new_mask)))
                return -EFAULT;
 
-       get_online_cpus();
+       cpus_read_lock();
        rcu_read_lock();
 
        p = find_process_by_pid(pid);
        if (!p) {
                rcu_read_unlock();
-               put_online_cpus();
+               cpus_read_unlock();
                return -ESRCH;
        }
 
@@ -147,7 +147,7 @@ out_free_cpus_allowed:
        free_cpumask_var(cpus_allowed);
 out_put_task:
        put_task_struct(p);
-       put_online_cpus();
+       cpus_read_unlock();
        return retval;
 }
 
@@ -166,8 +166,8 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
        if (len < real_len)
                return -EINVAL;
 
-       get_online_cpus();
-       read_lock(&tasklist_lock);
+       cpus_read_lock();
+       rcu_read_lock();
 
        retval = -ESRCH;
        p = find_process_by_pid(pid);
@@ -181,8 +181,8 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
        cpumask_and(&mask, &allowed, cpu_active_mask);
 
 out_unlock:
-       read_unlock(&tasklist_lock);
-       put_online_cpus();
+       rcu_read_unlock();
+       cpus_read_unlock();
        if (retval)
                return retval;
        if (copy_to_user(user_mask_ptr, &mask, real_len))