---

yaml --- r: 205428 b: refs/heads/master c: a44702e h: refs/heads/master v: v3
git-mirror · Jun 18, 2010 · 1e1c7ac · 1e1c7ac
1 parent c3425dd
commit 1e1c7ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6b12294405e6ec029e627c49adf3193829a2685
+refs/heads/master: a44702e8858a071aa0f2365113ea4a2e51c8b575
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4600,12 +4600,8 @@ static int __sched_setscheduler(struct task_struct *p, int policy,
 	 */
 	if (user && !capable(CAP_SYS_NICE)) {
 		if (rt_policy(policy)) {
-			unsigned long rlim_rtprio;
-
-			if (!lock_task_sighand(p, &flags))
-				return -ESRCH;
-			rlim_rtprio = task_rlimit(p, RLIMIT_RTPRIO);
-			unlock_task_sighand(p, &flags);
+			unsigned long rlim_rtprio =
+					task_rlimit(p, RLIMIT_RTPRIO);
 
 			/* can't set/change the rt policy */
 			if (policy != p->policy && !rlim_rtprio)