ktime: Get rid of the union

ktime is a union because the initial implementation stored the time in
scalar nanoseconds on 64 bit machine and in a endianess optimized timespec
variant for 32bit machines. The Y2038 cleanup removed the timespec variant
and switched everything to scalar nanoseconds. The union remained, but
become completely pointless.

Get rid of the union and just keep ktime_t as simple typedef of type s64.

The conversion was done with coccinelle and some manual mopping up.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index f5d4e275345e..ff046b73ff2d 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -587,7 +587,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
                         struct hrtimer *tmr = &tsk->signal->real_timer;
 
                         if (!hrtimer_is_queued(tmr) &&
-                            tsk->signal->it_real_incr.tv64 != 0) {
+                            tsk->signal->it_real_incr != 0) {
                                 hrtimer_forward(tmr, tmr->base->get_time(),
                                                 tsk->signal->it_real_incr);
                                 hrtimer_restart(tmr);
@@ -2766,7 +2766,7 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
 int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
                     const struct timespec *ts)
 {
-        ktime_t *to = NULL, timeout = { .tv64 = KTIME_MAX };
+        ktime_t *to = NULL, timeout = KTIME_MAX;
         struct task_struct *tsk = current;
         sigset_t mask = *which;
         int sig, ret = 0;
@@ -2786,7 +2786,7 @@ int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
 
         spin_lock_irq(&tsk->sighand->siglock);
         sig = dequeue_signal(tsk, &mask, info);
-        if (!sig && timeout.tv64) {
+        if (!sig && timeout) {
                 /*
                  * None ready, temporarily unblock those we're interested
                  * while we are sleeping in so that we'll be awakened when