Merge tag 'arc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[cascardo/linux.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 564f786..df058be 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -30,13 +30,12 @@ static int try_to_freeze_tasks(bool user_only)
        unsigned long end_time;
        unsigned int todo;
        bool wq_busy = false;
-       struct timeval start, end;
-       u64 elapsed_msecs64;
+       ktime_t start, end, elapsed;
        unsigned int elapsed_msecs;
        bool wakeup = false;
        int sleep_usecs = USEC_PER_MSEC;
 
-       do_gettimeofday(&start);
+       start = ktime_get_boottime();
 
        end_time = jiffies + msecs_to_jiffies(freeze_timeout_msecs);
 
@@ -78,10 +77,9 @@ static int try_to_freeze_tasks(bool user_only)
                        sleep_usecs *= 2;
        }
 
-       do_gettimeofday(&end);
-       elapsed_msecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
-       do_div(elapsed_msecs64, NSEC_PER_MSEC);
-       elapsed_msecs = elapsed_msecs64;
+       end = ktime_get_boottime();
+       elapsed = ktime_sub(end, start);
+       elapsed_msecs = ktime_to_ms(elapsed);
 
        if (todo) {
                pr_cont("\n");