Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10

This commit is contained in:
John Stultz
2014-06-18 09:32:43 -07:00
11 changed files with 832 additions and 128 deletions

View File

@@ -2378,6 +2378,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
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) {