Merge 4.14.85 into android-4.14-p

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index f9291b0effc2cdfbd7a12a2d489808d318139001..9d75510813cf9e8a4d2d2fa6c40a8de4d3215630 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1846,6 +1846,24 @@ static struct ctl_table fs_table[] = {
                .extra1         = &zero,
                .extra2         = &one,
        },
+       {
+               .procname       = "protected_fifos",
+               .data           = &sysctl_protected_fifos,
+               .maxlen         = sizeof(int),
+               .mode           = 0600,
+               .proc_handler   = proc_dointvec_minmax,
+               .extra1         = &zero,
+               .extra2         = &two,
+       },
+       {
+               .procname       = "protected_regular",
+               .data           = &sysctl_protected_regular,
+               .maxlen         = sizeof(int),
+               .mode           = 0600,
+               .proc_handler   = proc_dointvec_minmax,
+               .extra1         = &zero,
+               .extra2         = &two,
+       },
        {
                .procname       = "suid_dumpable",
                .data           = &suid_dumpable,