From 1e1c7ac39277605be731d148eaab467eed845c2a Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 11 Jun 2010 01:09:44 +0200 Subject: [PATCH] --- yaml --- r: 205428 b: refs/heads/master c: a44702e8858a071aa0f2365113ea4a2e51c8b575 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 577374e011d4..efbe8e1a624d 100644 --- 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 index 132950b33dde..b4427cc70acd 100644 --- 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)