Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

diff --cc arch/s390/oprofile/init.c
index 6cf2286d0405c0b111d5a41a35d0f3c912c88d0d,bd58b72454cf52c62b76bc049547931c74e020e6..2297be406c61a5d78d473a2890bb755715a8f210
--- 1/arch/s390/oprofile/init.c
--- 2/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@@ -123,12 -88,9 +123,12 @@@ static ssize_t hwsampler_write(struct f
                return -EINVAL;
  
        retval = oprofilefs_ulong_from_user(&val, buf, count);
-       if (retval)
+       if (retval <= 0)
                return retval;
  
 +      if (val != 0 && val != 1)
 +              return -EINVAL;
 +
        if (oprofile_started)
                /*
                 * save to do without locking as we set

diff --cc arch/x86/kernel/cpu/perf_event_intel.c
Simple merge

diff --cc kernel/events/core.c
Simple merge