X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fsched_debug.c;h=8a9498e7c8311e582f35709c7ffc3019fda2f601;hb=ad9546c9917d44eddc7676b639296d624cee455e;hp=be42548b67bb642e53402b926a57574ef6c528dc;hpb=d19ca30874f2ad343d054e0b5c0576744afeecd4;p=linux-2.6

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index be42548b67..8a9498e7c8 100644
--- a/kernel/sched_debug.c
+++ b/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] = "";
@@ -277,12 +277,9 @@ static int __init init_sched_debug_procfs(void)
 {
 	struct proc_dir_entry *pe;
 
-	pe = create_proc_entry("sched_debug", 0644, NULL);
+	pe = proc_create("sched_debug", 0644, NULL, &sched_debug_fops);
 	if (!pe)
 		return -ENOMEM;
-
-	pe->proc_fops = &sched_debug_fops;
-
 	return 0;
 }