Merge branch 'akpm' (patches from Andrew)

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

diff --git a/include/linux/sched.h b/include/linux/sched.h
index bd242bed4abb56d03b02a84b011a1cbfb7333356..084ed9fba62028eb7a9ec3214b3436f906eb31b2 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1791,8 +1791,8 @@ struct task_struct {
         * 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;
+       u64 timer_slack_ns;
+       u64 default_timer_slack_ns;
 
 #ifdef CONFIG_KASAN
        unsigned int kasan_depth;