diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /kernel/sys.c | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
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 c0a58be780a4..adaeab6f7a87 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -174,10 +174,10 @@ SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval) | |||
| 174 | 174 | ||
| 175 | /* normalize: avoid signed division (rounding problems) */ | 175 | /* normalize: avoid signed division (rounding problems) */ |
| 176 | error = -ESRCH; | 176 | error = -ESRCH; |
| 177 | if (niceval < -20) | 177 | if (niceval < MIN_NICE) |
| 178 | niceval = -20; | 178 | niceval = MIN_NICE; |
| 179 | if (niceval > 19) | 179 | if (niceval > MAX_NICE) |
| 180 | niceval = 19; | 180 | niceval = MAX_NICE; |
| 181 | 181 | ||
| 182 | rcu_read_lock(); | 182 | rcu_read_lock(); |
| 183 | read_lock(&tasklist_lock); | 183 | read_lock(&tasklist_lock); |