Merge commit 'linus/master' into merge-linus

[cascardo/linux.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index c226c7b..de53c10 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1304,6 +1304,12 @@ struct task_struct {
        int latency_record_count;
        struct latency_record latency_record[LT_SAVECOUNT];
 #endif
+       /*
+        * time slack values; these are used to round up poll() and
+        * select() etc timeout values. These are in nanoseconds.
+        */
+       unsigned long timer_slack_ns;
+       unsigned long default_timer_slack_ns;
 };
 
 /*