diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-28 03:23:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-28 03:23:13 -0500 |
| commit | 605c1a187f3ce82fbc243e2163c5ca8d1926df8e (patch) | |
| tree | c8065a8c5606a66f81dc494ce22a5baa5e0dfe7e /kernel/sys.c | |
| parent | 17a2a9b57a9a7d2fd8f97df951b5e63e0bd56ef5 (diff) | |
| parent | ce9277fb08e6e721482f7011ca28dcd0449b197c (diff) | |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 585d6cd10040..20ccfb5da6af 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -189,10 +189,10 @@ SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval) | |||
| 189 | !(user = find_user(who))) | 189 | !(user = find_user(who))) |
| 190 | goto out_unlock; /* No processes for this user */ | 190 | goto out_unlock; /* No processes for this user */ |
| 191 | 191 | ||
| 192 | do_each_thread(g, p) | 192 | do_each_thread(g, p) { |
| 193 | if (__task_cred(p)->uid == who) | 193 | if (__task_cred(p)->uid == who) |
| 194 | error = set_one_prio(p, niceval, error); | 194 | error = set_one_prio(p, niceval, error); |
| 195 | while_each_thread(g, p); | 195 | } while_each_thread(g, p); |
| 196 | if (who != cred->uid) | 196 | if (who != cred->uid) |
| 197 | free_uid(user); /* For find_user() */ | 197 | free_uid(user); /* For find_user() */ |
| 198 | break; | 198 | break; |
| @@ -252,13 +252,13 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who) | |||
| 252 | !(user = find_user(who))) | 252 | !(user = find_user(who))) |
| 253 | goto out_unlock; /* No processes for this user */ | 253 | goto out_unlock; /* No processes for this user */ |
| 254 | 254 | ||
| 255 | do_each_thread(g, p) | 255 | do_each_thread(g, p) { |
| 256 | if (__task_cred(p)->uid == who) { | 256 | if (__task_cred(p)->uid == who) { |
| 257 | niceval = 20 - task_nice(p); | 257 | niceval = 20 - task_nice(p); |
| 258 | if (niceval > retval) | 258 | if (niceval > retval) |
| 259 | retval = niceval; | 259 | retval = niceval; |
| 260 | } | 260 | } |
| 261 | while_each_thread(g, p); | 261 | } while_each_thread(g, p); |
| 262 | if (who != cred->uid) | 262 | if (who != cred->uid) |
| 263 | free_uid(user); /* for find_user() */ | 263 | free_uid(user); /* for find_user() */ |
| 264 | break; | 264 | break; |
