Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[sfrench/cifs-2.6.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d7669027aede358cfac25b729dfe8e50207c4b37..8298b2c240ce8e2cda3b8f0515608d9c403b3d6b 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1111,8 +1111,7 @@ static void uclamp_update_root_tg(void) { }
 #endif
 
 int sysctl_sched_uclamp_handler(struct ctl_table *table, int write,
-                               void __user *buffer, size_t *lenp,
-                               loff_t *ppos)
+                               void *buffer, size_t *lenp, loff_t *ppos)
 {
        bool update_root_tg = false;
        int old_min, old_max;
@@ -2782,7 +2781,7 @@ void set_numabalancing_state(bool enabled)
 
 #ifdef CONFIG_PROC_SYSCTL
 int sysctl_numa_balancing(struct ctl_table *table, int write,
-                        void __user *buffer, size_t *lenp, loff_t *ppos)
+                         void *buffer, size_t *lenp, loff_t *ppos)
 {
        struct ctl_table t;
        int err;
@@ -2856,8 +2855,8 @@ static void __init init_schedstats(void)
 }
 
 #ifdef CONFIG_PROC_SYSCTL
-int sysctl_schedstats(struct ctl_table *table, int write,
-                        void __user *buffer, size_t *lenp, loff_t *ppos)
+int sysctl_schedstats(struct ctl_table *table, int write, void *buffer,
+               size_t *lenp, loff_t *ppos)
 {
        struct ctl_table t;
        int err;