Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

[mirror_ubuntu-artful-kernel.git] / fs / eventpoll.c

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 8a74a2a52e0fa2607801c4c5e7e707379ac77fbf..bcb68fcc844515c67e7efc83710dabdce361f8b9 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -34,7 +34,7 @@
 #include <linux/mutex.h>
 #include <linux/anon_inodes.h>
 #include <linux/device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/io.h>
 #include <asm/mman.h>
 #include <linux/atomic.h>
@@ -1583,15 +1583,15 @@ static int ep_send_events(struct eventpoll *ep,
        return ep_scan_ready_list(ep, ep_send_events_proc, &esed, 0, false);
 }
 
-static inline struct timespec ep_set_mstimeout(long ms)
+static inline struct timespec64 ep_set_mstimeout(long ms)
 {
-       struct timespec now, ts = {
+       struct timespec64 now, ts = {
                .tv_sec = ms / MSEC_PER_SEC,
                .tv_nsec = NSEC_PER_MSEC * (ms % MSEC_PER_SEC),
        };
 
-       ktime_get_ts(&now);
-       return timespec_add_safe(now, ts);
+       ktime_get_ts64(&now);
+       return timespec64_add_safe(now, ts);
 }
 
 /**
@@ -1621,11 +1621,11 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
        ktime_t expires, *to = NULL;
 
        if (timeout > 0) {
-               struct timespec end_time = ep_set_mstimeout(timeout);
+               struct timespec64 end_time = ep_set_mstimeout(timeout);
 
                slack = select_estimate_accuracy(&end_time);
                to = &expires;
-               *to = timespec_to_ktime(end_time);
+               *to = timespec64_to_ktime(end_time);
        } else if (timeout == 0) {
                /*
                 * Avoid the unnecessary trip to the wait queue loop, if the