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 <mingo@elte.hu>

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_events.c
index 4d7e1498ae918c6aff6b3fe89dffc17d609763ce,3e2a7c91c548d2d1a16b0c89f4e62d686fb245b1..581876f9f3872e9103a0110893396652599a1d6a
--- 1/kernel/trace/trace_events.c
--- 2/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();