Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

[firefly-linux-kernel-4.4.55.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 0376b054a0d0f426816737f4266038cef9531ace..b1ce2aceaf49c0561e31145a14f44381d0ef8754 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1367,8 +1367,8 @@ struct task_struct {
        } vtime_snap_whence;
 #endif
        unsigned long nvcsw, nivcsw; /* context switch counts */
-       struct timespec start_time;             /* monotonic time */
-       struct timespec real_start_time;        /* boot based time */
+       u64 start_time;         /* monotonic time in nsec */
+       u64 real_start_time;    /* boot based time in nsec */
 /* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
        unsigned long min_flt, maj_flt;