Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[deliverable/linux.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9e3d2960faf534654f2b2ecc7d17549a725f77e0..6ace893c17c94dc737bda11fb63ee2811d34de79 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -222,8 +222,8 @@ static ctl_table kern_table[] = {
 #ifdef CONFIG_SCHED_DEBUG
        {
                .ctl_name       = CTL_UNNUMBERED,
-               .procname       = "sched_granularity_ns",
-               .data           = &sysctl_sched_granularity,
+               .procname       = "sched_min_granularity_ns",
+               .data           = &sysctl_sched_min_granularity,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_minmax,