summaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-25 14:39:12 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-25 14:39:12 +0200
commitf58899bb0224741eb0409ada67ecafe90ba137ef (patch)
tree78284f77021e830b32e77071dd2ef4e5ccdaa289 /kernel/sys.c
parenta2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff)
parent83097aca8567a0bd593534853b71fe0fa9a75d69 (diff)
downloadtalos-op-linux-f58899bb0224741eb0409ada67ecafe90ba137ef.tar.gz
talos-op-linux-f58899bb0224741eb0409ada67ecafe90ba137ef.zip
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 3dacb00a7f76..038a7bc0901d 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -169,9 +169,9 @@ asmlinkage long sys_setpriority(int which, int who, int niceval)
pgrp = find_vpid(who);
else
pgrp = task_pgrp(current);
- do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
+ do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
error = set_one_prio(p, niceval, error);
- } while_each_pid_task(pgrp, PIDTYPE_PGID, p);
+ } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
break;
case PRIO_USER:
user = current->user;
@@ -229,11 +229,11 @@ asmlinkage long sys_getpriority(int which, int who)
pgrp = find_vpid(who);
else
pgrp = task_pgrp(current);
- do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
+ do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
niceval = 20 - task_nice(p);
if (niceval > retval)
retval = niceval;
- } while_each_pid_task(pgrp, PIDTYPE_PGID, p);
+ } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
break;
case PRIO_USER:
user = current->user;
OpenPOWER on IntegriCloud