diff options
| author | Ali Al-Asadi <alasadi56@gmail.com> | 2017-12-25 09:25:31 +0100 |
|---|---|---|
| committer | Ali Al-Asadi <alasadi56@gmail.com> | 2017-12-25 09:25:31 +0100 |
| commit | d419af293a363e09587acb69910104a48dbf3deb (patch) | |
| tree | a8a213e370276be6642c710fe35264558ef918f5 /kernel/timer.c | |
| parent | 87d59c267cf877f59e46981a0b87d05af5a8a65b (diff) | |
| parent | 15c63d8508791a0733c9f0229f75864ad3e99d4e (diff) | |
Merge https://github.com/TeamButter/android_kernel_motorola_msm8952 into o8.1o8.0
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 87731456d8a..09b86498428 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1150,7 +1150,7 @@ static int cascade(struct tvec_base *base, struct tvec *tv, int index) static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long), unsigned long data) { - int count = preempt_count(); + int preempt_count = preempt_count(); #ifdef CONFIG_LOCKDEP /* @@ -1177,16 +1177,16 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long), lock_map_release(&lockdep_map); - if (count != preempt_count()) { + if (preempt_count != preempt_count()) { WARN_ONCE(1, "timer: %pF preempt leak: %08x -> %08x\n", - fn, count, preempt_count()); + fn, preempt_count, preempt_count()); /* * Restore the preempt count. That gives us a decent * chance to survive and extract information. If the * callback kept a lock held, bad luck, but not worse * than the BUG() we had. */ - preempt_count_set(count); + preempt_count() = preempt_count; } } |