shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Browse Source 
Conflicts:
	net/wireless/nl80211.c
This commit is contained in:
Mark Brown
2014-06-19 11:42:18 +01:00
parent 8bf8e46c30 18d0981fbb
commit 40329a6815
11 changed files with 827 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/sys.c
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) {