Update to 3.4-rc2.

[linux-flexiantxendom0-3.2.10.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4ab1187..7055255 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -660,6 +660,15 @@ static struct ctl_table kern_table[] = {
                .extra1         = &pid_max_min,
                .extra2         = &pid_max_max,
        },
+#if defined(CONFIG_MODULES) && defined(CONFIG_ENTERPRISE_SUPPORT)
+       {
+               .procname       = "unsupported",
+               .data           = &unsupported,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+#endif
        {
                .procname       = "panic_on_oops",
                .data           = &panic_on_oops,
@@ -840,6 +849,13 @@ static struct ctl_table kern_table[] = {
                .proc_handler   = proc_dointvec,
        },
 #endif
+       {
+               .procname       = "suid_dumpable",
+               .data           = &suid_dumpable,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec,
+       },
 #if defined(CONFIG_S390) && defined(CONFIG_SMP)
        {
                .procname       = "spin_retry",