ktime: Get rid of the union

[mirror_ubuntu-zesty-kernel.git] / kernel / time / itimer.c

diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index 2b9f45bc955d1bf0963e1899647bcc2d53f8da03..8c89143f9ebf19fb96ac47b9c22be08fbafdc583 100644 (file)
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -14,7 +14,7 @@
 #include <linux/hrtimer.h>
 #include <trace/events/timer.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 /**
  * itimer_get_remtime - get remaining time for the timer
@@ -34,10 +34,10 @@ static struct timeval itimer_get_remtime(struct hrtimer *timer)
         * then we return 0 - which is correct.
         */
        if (hrtimer_active(timer)) {
-               if (rem.tv64 <= 0)
-                       rem.tv64 = NSEC_PER_USEC;
+               if (rem <= 0)
+                       rem = NSEC_PER_USEC;
        } else
-               rem.tv64 = 0;
+               rem = 0;
 
        return ktime_to_timeval(rem);
 }
@@ -216,12 +216,12 @@ again:
                        goto again;
                }
                expires = timeval_to_ktime(value->it_value);
-               if (expires.tv64 != 0) {
+               if (expires != 0) {
                        tsk->signal->it_real_incr =
                                timeval_to_ktime(value->it_interval);
                        hrtimer_start(timer, expires, HRTIMER_MODE_REL);
                } else
-                       tsk->signal->it_real_incr.tv64 = 0;
+                       tsk->signal->it_real_incr = 0;
 
                trace_itimer_state(ITIMER_REAL, value, 0);
                spin_unlock_irq(&tsk->sighand->siglock);