diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
| commit | 37b16beaa92860c378273ccdcc2ccb22c6cee047 (patch) | |
| tree | 4fc7f879c32d11d318f411dbe128d080ed8478f9 /kernel/timer.c | |
| parent | 3e46d21285577a8c9e4c37f9b1002e567c440b28 (diff) | |
| parent | a4b4f11b2783ec678cccb4ce7e4ce9665aa04a24 (diff) | |
| download | cachepc-linux-37b16beaa92860c378273ccdcc2ccb22c6cee047.tar.gz cachepc-linux-37b16beaa92860c378273ccdcc2ccb22c6cee047.zip | |
Merge branch 'perf/urgent' into perf/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 87bd529879c2..3bb01a323b2a 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -838,7 +838,7 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires) bit = find_last_bit(&mask, BITS_PER_LONG); - mask = (1 << bit) - 1; + mask = (1UL << bit) - 1; expires_limit = expires_limit & ~(mask); |