arm64: dts: rockchip: remove unused "rockchip,dsi-panel" property

[firefly-linux-kernel-4.4.55.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 8b0542861c4256af940a588f06323f0459962d62..6e64c71e00a0c04f7f0117fda31c9847d10dfe3e 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -175,7 +175,7 @@ extern int no_unaligned_warning;
 #define SYSCTL_WRITES_WARN      0
 #define SYSCTL_WRITES_STRICT    1
 
-static int sysctl_writes_strict = SYSCTL_WRITES_WARN;
+static int sysctl_writes_strict = SYSCTL_WRITES_STRICT;
 
 static int proc_do_cad_pid(struct ctl_table *table, int write,
                  void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -306,8 +306,8 @@ static struct ctl_table kern_table[] = {
                .extra2         = &max_sched_granularity_ns,
        },
        {
-               .procname       = "sched_is_big_little",
-               .data           = &sysctl_sched_is_big_little,
+               .procname       = "sched_sync_hint_enable",
+               .data           = &sysctl_sched_sync_hint_enable,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
@@ -342,13 +342,6 @@ static struct ctl_table kern_table[] = {
                .proc_handler   = proc_dointvec,
        },
 #endif
-       {
-               .procname       = "sched_sync_hint_enable",
-               .data           = &sysctl_sched_sync_hint_enable,
-               .maxlen         = sizeof(unsigned int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec,
-       },
        {
                .procname       = "sched_initial_task_util",
                .data           = &sysctl_sched_initial_task_util,
@@ -2171,9 +2164,12 @@ static int do_proc_douintvec_conv(bool *negp, unsigned long *lvalp,
        if (write) {
                if (*negp)
                        return -EINVAL;
+               if (*lvalp > UINT_MAX)
+                       return -EINVAL;
                *valp = *lvalp;
        } else {
                unsigned int val = *valp;
+               *negp = false;
                *lvalp = (unsigned long)val;
        }
        return 0;