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

[openwrt/staging/blogic.git] / kernel / kprobes.c

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 3f310df4a693eb7da189dc6b0f8f33e068fdebec..0fbdee78266b0f43eae923c480f34bf58a5ad242 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -892,7 +892,7 @@ static void unoptimize_all_kprobes(void)
 static DEFINE_MUTEX(kprobe_sysctl_mutex);
 int sysctl_kprobes_optimization;
 int proc_kprobes_optimization_handler(struct ctl_table *table, int write,
-                                     void __user *buffer, size_t *length,
+                                     void *buffer, size_t *length,
                                      loff_t *ppos)
 {
        int ret;