1 files changed, 9 insertions, 25 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 78efe7c485ac..4b1753f7e48e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -97,7 +97,7 @@ struct sched_param {
 struct exec_domain;
 struct futex_pi_state;
 struct robust_list_head;
-struct bio;
+struct bio_list;
 struct fs_struct;
 struct bts_context;
 struct perf_event_context;
@@ -740,14 +740,6 @@ struct user_struct {
         uid_t uid;
         struct user_namespace *user_ns;
 
-#ifdef CONFIG_USER_SCHED
-        struct task_group *tg;
-#ifdef CONFIG_SYSFS
-        struct kobject kobj;
-        struct delayed_work work;
-#endif
-#endif
-
 #ifdef CONFIG_PERF_EVENTS
         atomic_long_t locked_vm;
 #endif
@@ -878,7 +870,10 @@ static inline int sd_balance_for_mc_power(void)
         if (sched_smt_power_savings)
                 return SD_POWERSAVINGS_BALANCE;
 
-        return SD_PREFER_SIBLING;
+        if (!sched_mc_power_savings)
+                return SD_PREFER_SIBLING;
+
+        return 0;
 }
 
 static inline int sd_balance_for_package_power(void)
@@ -1084,7 +1079,8 @@ struct sched_domain;
 struct sched_class {
         const struct sched_class *next;
 
-        void (*enqueue_task) (struct rq *rq, struct task_struct *p, int wakeup);
+        void (*enqueue_task) (struct rq *rq, struct task_struct *p, int wakeup,
+                              bool head);
         void (*dequeue_task) (struct rq *rq, struct task_struct *p, int sleep);
         void (*yield_task) (struct rq *rq);
 
@@ -1096,14 +1092,6 @@ struct sched_class {
 #ifdef CONFIG_SMP
         int  (*select_task_rq)(struct task_struct *p, int sd_flag, int flags);
 
-        unsigned long (*load_balance) (struct rq *this_rq, int this_cpu,
-                        struct rq *busiest, unsigned long max_load_move,
-                        struct sched_domain *sd, enum cpu_idle_type idle,
-                        int *all_pinned, int *this_best_prio);
-
-        int (*move_one_task) (struct rq *this_rq, int this_cpu,
-                              struct rq *busiest, struct sched_domain *sd,
-                              enum cpu_idle_type idle);
         void (*pre_schedule) (struct rq *this_rq, struct task_struct *task);
         void (*post_schedule) (struct rq *this_rq);
         void (*task_waking) (struct rq *this_rq, struct task_struct *task);
@@ -1466,7 +1454,7 @@ struct task_struct {
         void *journal_info;
 
 /* stacked block device info */
-        struct bio *bio_list, **bio_tail;
+        struct bio_list *bio_list;
 
 /* VM state */
         struct reclaim_state *reclaim_state;
@@ -2517,13 +2505,9 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
 
 extern void normalize_rt_tasks(void);
 
-#ifdef CONFIG_GROUP_SCHED
+#ifdef CONFIG_CGROUP_SCHED
 
 extern struct task_group init_task_group;
-#ifdef CONFIG_USER_SCHED
-extern struct task_group root_task_group;
-extern void set_tg_uid(struct user_struct *user);
-#endif
 
 extern struct task_group *sched_create_group(struct task_group *parent);
 extern void sched_destroy_group(struct task_group *tg);