Merge remote-tracking branch 'cgroup/for-next'

diff --combined kernel/sched/core.c
index e85cda20ab2b8ed6694d1cfa4a617b1bf231569d,7e8cbb9ee4d6835649d6ddcdf4c99f329cbb42b3..33c0dabd83e39aadf6b14b7644845e708f5284bc
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -2660,7 -2660,6 +2660,7 @@@ asmlinkage void __sched notrace preempt
        } while (need_resched());
  }
  EXPORT_SYMBOL(preempt_schedule);
 +#endif /* CONFIG_PREEMPT */
  
  /*
   * this is the entry point to schedule() from kernel preemption
@@@ -2694,6 -2693,8 +2694,6 @@@ asmlinkage void __sched preempt_schedul
        exception_exit(prev_state);
  }
  
 -#endif /* CONFIG_PREEMPT */
 -
  int default_wake_function(wait_queue_t *curr, unsigned mode, int wake_flags,
                          void *key)
  {
@@@ -4761,7 -4762,7 +4761,7 @@@ static void rq_attach_root(struct rq *r
                cpumask_clear_cpu(rq->cpu, old_rd->span);
  
                /*
 -               * If we dont want to free the old_rt yet then
 +               * If we dont want to free the old_rd yet then
                 * set old_rd to NULL to skip the freeing later
                 * in this function:
                 */
@@@ -4909,9 -4910,8 +4909,9 @@@ static void update_top_cache_domain(in
        if (sd) {
                id = cpumask_first(sched_domain_span(sd));
                size = cpumask_weight(sched_domain_span(sd));
 -              rcu_assign_pointer(per_cpu(sd_busy, cpu), sd->parent);
 +              sd = sd->parent; /* sd_busy */
        }
 +      rcu_assign_pointer(per_cpu(sd_busy, cpu), sd);
  
        rcu_assign_pointer(per_cpu(sd_llc, cpu), sd);
        per_cpu(sd_llc_size, cpu) = size;
@@@ -7256,15 -7256,14 +7256,14 @@@ static int __cfs_schedulable(struct tas
        return ret;
  }
  
- static int cpu_stats_show(struct cgroup_subsys_state *css, struct cftype *cft,
-               struct cgroup_map_cb *cb)
+ static int cpu_stats_show(struct seq_file *sf, void *v)
  {
-       struct task_group *tg = css_tg(css);
+       struct task_group *tg = css_tg(seq_css(sf));
        struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
  
-       cb->fill(cb, "nr_periods", cfs_b->nr_periods);
-       cb->fill(cb, "nr_throttled", cfs_b->nr_throttled);
-       cb->fill(cb, "throttled_time", cfs_b->throttled_time);
+       seq_printf(sf, "nr_periods %d\n", cfs_b->nr_periods);
+       seq_printf(sf, "nr_throttled %d\n", cfs_b->nr_throttled);
+       seq_printf(sf, "throttled_time %llu\n", cfs_b->throttled_time);
  
        return 0;
  }
@@@ -7318,7 -7317,7 +7317,7 @@@ static struct cftype cpu_files[] = 
        },
        {
                .name = "stat",
-               .read_map = cpu_stats_show,
+               .seq_show = cpu_stats_show,
        },
  #endif
  #ifdef CONFIG_RT_GROUP_SCHED