Merge tag 'powerpc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / powerpc / platforms / cell / spufs / file.c

diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 5ffcdeb..c1be486 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -762,10 +762,10 @@ out:
        return count;
 }
 
-static unsigned int spufs_ibox_poll(struct file *file, poll_table *wait)
+static __poll_t spufs_ibox_poll(struct file *file, poll_table *wait)
 {
        struct spu_context *ctx = file->private_data;
-       unsigned int mask;
+       __poll_t mask;
 
        poll_wait(file, &ctx->ibox_wq, wait);
 
@@ -898,10 +898,10 @@ out:
        return count;
 }
 
-static unsigned int spufs_wbox_poll(struct file *file, poll_table *wait)
+static __poll_t spufs_wbox_poll(struct file *file, poll_table *wait)
 {
        struct spu_context *ctx = file->private_data;
-       unsigned int mask;
+       __poll_t mask;
 
        poll_wait(file, &ctx->wbox_wq, wait);
 
@@ -1690,11 +1690,11 @@ out:
        return ret;
 }
 
-static unsigned int spufs_mfc_poll(struct file *file,poll_table *wait)
+static __poll_t spufs_mfc_poll(struct file *file,poll_table *wait)
 {
        struct spu_context *ctx = file->private_data;
        u32 free_elements, tagstatus;
-       unsigned int mask;
+       __poll_t mask;
 
        poll_wait(file, &ctx->mfc_wq, wait);
 
@@ -2375,8 +2375,8 @@ static int switch_log_sprint(struct spu_context *ctx, char *tbuf, int n)
 
        p = ctx->switch_log->log + ctx->switch_log->tail % SWITCH_LOG_BUFSIZE;
 
-       return snprintf(tbuf, n, "%u.%09u %d %u %u %llu\n",
-                       (unsigned int) p->tstamp.tv_sec,
+       return snprintf(tbuf, n, "%llu.%09u %d %u %u %llu\n",
+                       (unsigned long long) p->tstamp.tv_sec,
                        (unsigned int) p->tstamp.tv_nsec,
                        p->spu_id,
                        (unsigned int) p->type,
@@ -2455,11 +2455,11 @@ static ssize_t spufs_switch_log_read(struct file *file, char __user *buf,
        return cnt == 0 ? error : cnt;
 }
 
-static unsigned int spufs_switch_log_poll(struct file *file, poll_table *wait)
+static __poll_t spufs_switch_log_poll(struct file *file, poll_table *wait)
 {
        struct inode *inode = file_inode(file);
        struct spu_context *ctx = SPUFS_I(inode)->i_ctx;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
        int rc;
 
        poll_wait(file, &ctx->switch_log->wait, wait);
@@ -2499,7 +2499,7 @@ void spu_switch_log_notify(struct spu *spu, struct spu_context *ctx,
                struct switch_log_entry *p;
 
                p = ctx->switch_log->log + ctx->switch_log->head;
-               ktime_get_ts(&p->tstamp);
+               ktime_get_ts64(&p->tstamp);
                p->timebase = get_tb();
                p->spu_id = spu ? spu->number : -1;
                p->type = type;