diff --git a/[refs] b/[refs] index 7a20250857ee..f8c8c74cc0ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d031476408ae0f5196e3c579f519dfdefb099b67 +refs/heads/master: 900cfa46191a7d87cf1891924cb90499287fd235 diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index 493c4b8b8cba..635739d219da 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -300,11 +300,10 @@ EXPORT_SYMBOL_GPL(ktime_sub_ns); */ u64 ktime_divns(const ktime_t kt, s64 div) { - u64 dclc, inc, dns; + u64 dclc; int sft = 0; - dclc = dns = ktime_to_ns(kt); - inc = div; + dclc = ktime_to_ns(kt); /* Make sure the divisor is less than 2^32: */ while (div >> 32) { sft++;