From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jan 2012 16:02:58 +0000 (-0800)
Subject: Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=35b740e4662ef386f0c60e1b60aaf5b44db9914c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'perf-core-for-linus' of git://git./linux/kernel/git/tip/tip

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)
  perf kvm: Fix copy & paste error in description
  perf script: Kill script_spec__delete
  perf top: Fix a memory leak
  perf stat: Introduce get_ratio_color() helper
  perf session: Remove impossible condition check
  perf tools: Fix feature-bits rework fallout, remove unused variable
  perf script: Add generic perl handler to process events
  perf tools: Use for_each_set_bit() to iterate over feature flags
  perf tools: Unify handling of features when writing feature section
  perf report: Accept fifos as input file
  perf tools: Moving code in some files
  perf tools: Fix out-of-bound access to struct perf_session
  perf tools: Continue processing header on unknown features
  perf tools: Improve macros for struct feature_ops
  perf: builtin-record: Document and check that mmap_pages must be a power of two.
  perf: builtin-record: Provide advice if mmap'ing fails with EPERM.
  perf tools: Fix truncated annotation
  perf script: look up thread using tid instead of pid
  perf tools: Look up thread names for system wide profiling
  perf tools: Fix comm for processes with named threads
  ...
---

35b740e4662ef386f0c60e1b60aaf5b44db9914c
diff --cc arch/s390/oprofile/init.c
index bd58b72454cf,6cf2286d0405..2297be406c61
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@@ -88,9 -123,12 +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