1 files changed, 14 insertions, 10 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2e490271acf6..17249fae5014 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -734,7 +734,6 @@ struct sched_domain {
         unsigned long max_interval;     /* Maximum balance interval ms */
         unsigned int busy_factor;       /* less balancing by factor if busy */
         unsigned int imbalance_pct;     /* No balance until over watermark */
-        unsigned long long cache_hot_time; /* Task considered cache hot (ns) */
         unsigned int cache_nice_tries;  /* Leave cache hot tasks for # tries */
         unsigned int busy_idx;
         unsigned int idle_idx;
@@ -875,7 +874,7 @@ struct sched_class {
 
         void (*set_curr_task) (struct rq *rq);
         void (*task_tick) (struct rq *rq, struct task_struct *p);
-        void (*task_new) (struct rq *rq, struct task_struct *p);
+        void (*task_new) (struct rq *rq, struct task_struct *p, u64 now);
 };
 
 struct load_weight {
@@ -905,23 +904,28 @@ struct sched_entity {
         struct rb_node          run_node;
         unsigned int            on_rq;
 
+        u64                     exec_start;
+        u64                     sum_exec_runtime;
         u64                     wait_start_fair;
+        u64                     sleep_start_fair;
+
+#ifdef CONFIG_SCHEDSTATS
         u64                     wait_start;
-        u64                     exec_start;
+        u64                     wait_max;
+        s64                     sum_wait_runtime;
+
         u64                     sleep_start;
-        u64                     sleep_start_fair;
-        u64                     block_start;
         u64                     sleep_max;
+        s64                     sum_sleep_runtime;
+
+        u64                     block_start;
         u64                     block_max;
         u64                     exec_max;
-        u64                     wait_max;
-        u64                     last_ran;
 
-        u64                     sum_exec_runtime;
-        s64                     sum_wait_runtime;
-        s64                     sum_sleep_runtime;
         unsigned long           wait_runtime_overruns;
         unsigned long           wait_runtime_underruns;
+#endif
+
 #ifdef CONFIG_FAIR_GROUP_SCHED
         struct sched_entity     *parent;
         /* rq on which this entity is (to be) queued: */