Merge branch 'next' into for-linus

Prepare first round of input updates for 3.20.

1 files changed, 13 insertions, 11 deletions

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 627b3c34b821..92cc52001e74 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -150,7 +150,6 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)
 static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)
 {
         struct task_struct *g, *p;
-        unsigned long flags;
 
         SEQ_printf(m,
         "\nrunnable tasks:\n"
@@ -159,16 +158,14 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)
         "------------------------------------------------------"
         "----------------------------------------------------\n");
 
-        read_lock_irqsave(&tasklist_lock, flags);
-
-        do_each_thread(g, p) {
+        rcu_read_lock();
+        for_each_process_thread(g, p) {
                 if (task_cpu(p) != rq_cpu)
                         continue;
 
                 print_task(m, rq, p);
-        } while_each_thread(g, p);
-
-        read_unlock_irqrestore(&tasklist_lock, flags);
+        }
+        rcu_read_unlock();
 }
 
 void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
@@ -264,6 +261,12 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
 #undef P
 }
 
+void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq)
+{
+        SEQ_printf(m, "\ndl_rq[%d]:\n", cpu);
+        SEQ_printf(m, "  .%-30s: %ld\n", "dl_nr_running", dl_rq->dl_nr_running);
+}
+
 extern __read_mostly int sched_clock_running;
 
 static void print_cpu(struct seq_file *m, int cpu)
@@ -332,10 +335,9 @@ do {									\
         spin_lock_irqsave(&sched_debug_lock, flags);
         print_cfs_stats(m, cpu);
         print_rt_stats(m, cpu);
+        print_dl_stats(m, cpu);
 
-        rcu_read_lock();
         print_rq(m, rq, cpu);
-        rcu_read_unlock();
         spin_unlock_irqrestore(&sched_debug_lock, flags);
         SEQ_printf(m, "\n");
 }
@@ -533,8 +535,8 @@ static void sched_show_numa(struct task_struct *p, struct seq_file *m)
                         unsigned long nr_faults = -1;
                         int cpu_current, home_node;
 
-                        if (p->numa_faults_memory)
-                                nr_faults = p->numa_faults_memory[2*node + i];
+                        if (p->numa_faults)
+                                nr_faults = p->numa_faults[2*node + i];
 
                         cpu_current = !i ? (task_node(p) == node) :
                                 (pol && node_isset(node, pol->v.nodes));