Merge tag 'xfs-for-linus-3.17-rc1' of git://oss.sgi.com/xfs/xfs

[cascardo/linux.git] / arch / powerpc / platforms / cell / spufs / sched.c

diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 4a0a64f..998f632 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -1039,13 +1039,11 @@ void spuctx_switch_state(struct spu_context *ctx,
 {
        unsigned long long curtime;
        signed long long delta;
-       struct timespec ts;
        struct spu *spu;
        enum spu_utilization_state old_state;
        int node;
 
-       ktime_get_ts(&ts);
-       curtime = timespec_to_ns(&ts);
+       curtime = ktime_get_ns();
        delta = curtime - ctx->stats.tstamp;
 
        WARN_ON(!mutex_is_locked(&ctx->state_mutex));