Merge tag 'drm/tegra/for-3.19-rc1-fixes' of git://people.freedesktop.org/~tagr/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / char / hangcheck-timer.c

diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index ebc4c73d8ca42b3477abb2203fd12ace9553b4ea..a7c5c59675f06944405e560cf54575fbe0f07e23 100644 (file)
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -168,8 +168,8 @@ static int __init hangcheck_init(void)
        printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds).\n",
               VERSION_STR, hangcheck_tick, hangcheck_margin);
        hangcheck_tsc_margin =
-               (unsigned long long)(hangcheck_margin + hangcheck_tick);
-       hangcheck_tsc_margin *= (unsigned long long)TIMER_FREQ;
+               (unsigned long long)hangcheck_margin + hangcheck_tick;
+       hangcheck_tsc_margin *= TIMER_FREQ;
 
        hangcheck_tsc = ktime_get_ns();
        mod_timer(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));