genirq/msi: Check for the presence of an irq domain when validating msi_ctrl

[linux-2.6-microblaze.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index c6d9dec..137d4ab 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1633,25 +1633,6 @@ int proc_do_static_key(struct ctl_table *table, int write,
 }
 
 static struct ctl_table kern_table[] = {
-#ifdef CONFIG_NUMA_BALANCING
-       {
-               .procname       = "numa_balancing",
-               .data           = NULL, /* filled in by handler */
-               .maxlen         = sizeof(unsigned int),
-               .mode           = 0644,
-               .proc_handler   = sysctl_numa_balancing,
-               .extra1         = SYSCTL_ZERO,
-               .extra2         = SYSCTL_FOUR,
-       },
-       {
-               .procname       = "numa_balancing_promote_rate_limit_MBps",
-               .data           = &sysctl_numa_balancing_promote_rate_limit,
-               .maxlen         = sizeof(unsigned int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_minmax,
-               .extra1         = SYSCTL_ZERO,
-       },
-#endif /* CONFIG_NUMA_BALANCING */
        {
                .procname       = "panic",
                .data           = &panic_timeout,
@@ -2125,6 +2106,7 @@ static struct ctl_table vm_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
                .extra1         = SYSCTL_ZERO,
+               .extra2         = (void *)&page_cluster_max,
        },
        {
                .procname       = "dirtytime_expire_seconds",