diff --git a/[refs] b/[refs]
index af65146dc64c..9b68d2371b18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9b158fe1ca2c166ff918de30cb098eafcae487a
+refs/heads/master: 486fdae21458bd9f4e125099bb3c38a4064e450e
diff --git a/trunk/kernel/sched_debug.c b/trunk/kernel/sched_debug.c
index be42548b67bb..f3f4af4b8b0f 100644
--- a/trunk/kernel/sched_debug.c
+++ b/trunk/kernel/sched_debug.c
@@ -119,7 +119,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 	struct sched_entity *last;
 	unsigned long flags;
 
-#ifndef CONFIG_CGROUP_SCHED
+#if !defined(CONFIG_CGROUP_SCHED) || !defined(CONFIG_USER_SCHED)
 	SEQ_printf(m, "\ncfs_rq[%d]:\n", cpu);
 #else
 	char path[128] = "";