Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

[firefly-linux-kernel-4.4.55.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 0b08c9f000f35e3ad8b8e72bac69715b96d6cb68..a3bef5bd452b6ab64a8604ca5f661530d4ef4895 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2377,26 +2377,6 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                        else
                                return -EINVAL;
                        break;
-               case PR_SET_TIMERSLACK_PID:
-                       if (current->pid != (pid_t)arg3 &&
-                                       !capable(CAP_SYS_NICE))
-                               return -EPERM;
-                       rcu_read_lock();
-                       tsk = find_task_by_pid_ns((pid_t)arg3, &init_pid_ns);
-                       if (tsk == NULL) {
-                               rcu_read_unlock();
-                               return -EINVAL;
-                       }
-                       get_task_struct(tsk);
-                       rcu_read_unlock();
-                       if (arg2 <= 0)
-                               tsk->timer_slack_ns =
-                                       tsk->default_timer_slack_ns;
-                       else
-                               tsk->timer_slack_ns = arg2;
-                       put_task_struct(tsk);
-                       error = 0;
-                       break;
                default:
                        return -EINVAL;
                }
@@ -2416,6 +2396,26 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
        case PR_GET_TID_ADDRESS:
                error = prctl_get_tid_address(me, (int __user **)arg2);
                break;
+       case PR_SET_TIMERSLACK_PID:
+               if (task_pid_vnr(current) != (pid_t)arg3 &&
+                               !capable(CAP_SYS_NICE))
+                       return -EPERM;
+               rcu_read_lock();
+               tsk = find_task_by_vpid((pid_t)arg3);
+               if (tsk == NULL) {
+                       rcu_read_unlock();
+                       return -EINVAL;
+               }
+               get_task_struct(tsk);
+               rcu_read_unlock();
+               if (arg2 <= 0)
+                       tsk->timer_slack_ns =
+                               tsk->default_timer_slack_ns;
+               else
+                       tsk->timer_slack_ns = arg2;
+               put_task_struct(tsk);
+               error = 0;
+               break;
        case PR_SET_CHILD_SUBREAPER:
                me->signal->is_child_subreaper = !!arg2;
                break;