Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-beck.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index fba0f29401eafba43b29602b0296ee16022b4633..66a751ebf9d9c77be801d263d0844d40a8b52ad0 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -250,7 +250,7 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
                        else
                                p = current;
                        if (p) {
-                               niceval = 20 - task_nice(p);
+                               niceval = nice_to_rlimit(task_nice(p));
                                if (niceval > retval)
                                        retval = niceval;
                        }
@@ -261,7 +261,7 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
                        else
                                pgrp = task_pgrp(current);
                        do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
-                               niceval = 20 - task_nice(p);
+                               niceval = nice_to_rlimit(task_nice(p));
                                if (niceval > retval)
                                        retval = niceval;
                        } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
@@ -277,7 +277,7 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
 
                        do_each_thread(g, p) {
                                if (uid_eq(task_uid(p), uid)) {
-                                       niceval = 20 - task_nice(p);
+                                       niceval = nice_to_rlimit(task_nice(p));
                                        if (niceval > retval)
                                                retval = niceval;
                                }