Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[~andy/linux] / kernel / sched_debug.c

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 1baf87cceb7c0a2d93151aa0b03e71de9c088d5d..0eca442b77922b8702ef0167f8e4361d0fd5ffe1 100644 (file)
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -171,7 +171,7 @@ static int sched_debug_show(struct seq_file *m, void *v)
        u64 now = ktime_to_ns(ktime_get());
        int cpu;
 
-       SEQ_printf(m, "Sched Debug Version: v0.04, cfs-v20, %s %.*s\n",
+       SEQ_printf(m, "Sched Debug Version: v0.05, %s %.*s\n",
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version);
@@ -186,7 +186,7 @@ static int sched_debug_show(struct seq_file *m, void *v)
        return 0;
 }
 
-void sysrq_sched_debug_show(void)
+static void sysrq_sched_debug_show(void)
 {
        sched_debug_show(NULL, NULL);
 }
@@ -200,7 +200,7 @@ static struct file_operations sched_debug_fops = {
        .open           = sched_debug_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = seq_release,
+       .release        = single_release,
 };
 
 static int __init init_sched_debug_procfs(void)