sched/fair: replace cfs_rq->rb_leftmost

[sfrench/cifs-2.6.git] / kernel / sched / sched.h

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index eeef1a3086d1e74af034782cd780bbf7e44333b2..c30c57563dbc7ef0cf744475ee6a80d331a08732 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -426,8 +426,7 @@ struct cfs_rq {
        u64 min_vruntime_copy;
 #endif
 
-       struct rb_root tasks_timeline;
-       struct rb_node *rb_leftmost;
+       struct rb_root_cached tasks_timeline;
 
        /*
         * 'curr' points to currently running entity on this cfs_rq.
@@ -769,7 +768,7 @@ struct rq {
 #ifdef CONFIG_SCHED_HRTICK
 #ifdef CONFIG_SMP
        int hrtick_csd_pending;
-       struct call_single_data hrtick_csd;
+       call_single_data_t hrtick_csd;
 #endif
        struct hrtimer hrtick_timer;
 #endif
@@ -1120,11 +1119,15 @@ extern int group_balance_cpu(struct sched_group *sg);
 
 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
 void register_sched_domain_sysctl(void);
+void dirty_sched_domain_sysctl(int cpu);
 void unregister_sched_domain_sysctl(void);
 #else
 static inline void register_sched_domain_sysctl(void)
 {
 }
+static inline void dirty_sched_domain_sysctl(int cpu)
+{
+}
 static inline void unregister_sched_domain_sysctl(void)
 {
 }
@@ -2070,19 +2073,13 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags)
 {
        struct update_util_data *data;
 
-       data = rcu_dereference_sched(*this_cpu_ptr(&cpufreq_update_util_data));
+       data = rcu_dereference_sched(*per_cpu_ptr(&cpufreq_update_util_data,
+                                                 cpu_of(rq)));
        if (data)
                data->func(data, rq_clock(rq), flags);
 }
-
-static inline void cpufreq_update_this_cpu(struct rq *rq, unsigned int flags)
-{
-       if (cpu_of(rq) == smp_processor_id())
-               cpufreq_update_util(rq, flags);
-}
 #else
 static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}
-static inline void cpufreq_update_this_cpu(struct rq *rq, unsigned int flags) {}
 #endif /* CONFIG_CPU_FREQ */
 
 #ifdef arch_scale_freq_capacity