From: Ingo Molnar Date: Thu, 21 Jul 2011 07:29:14 +0000 (+0200) Subject: Merge branch 'perf/urgent' into perf/core X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=492f73a303b488ffd67097b2351d54aa6e6c7c73;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'perf/urgent' into perf/core Merge reason: pick up the latest fixes - they won't make v3.0. Signed-off-by: Ingo Molnar --- 492f73a303b488ffd67097b2351d54aa6e6c7c73 diff --cc kernel/trace/trace_events.c index 4d7e1498ae91,3e2a7c91c548..581876f9f387 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@@ -560,12 -598,22 +589,13 @@@ static ssize_ system_enable_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) { - const char *system = filp->private_data; + struct event_subsystem *system = filp->private_data; + const char *name = NULL; unsigned long val; - char buf[64]; ssize_t ret; - if (cnt >= sizeof(buf)) - return -EINVAL; - - if (copy_from_user(&buf, ubuf, cnt)) - return -EFAULT; - - buf[cnt] = 0; - - ret = strict_strtoul(buf, 10, &val); - if (ret < 0) + ret = kstrtoul_from_user(ubuf, cnt, 10, &val); + if (ret) return ret; ret = tracing_update_buffers();