projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index 15bc1b41021dae203b7d3c43293b5edd54cff4cb..20f45ea6f5a4a791c7bd0ba598d490192548f775 100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-822,7
+822,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 = (1
UL
<< bit) - 1;
expires_limit = expires_limit & ~(mask);