From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 8 Jan 2012 11:31:24 +0000 (+0100)
Subject: Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=636f0c70f2557e0819b50c74e31b4a027327015e;p=linux-beck.git

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
---

636f0c70f2557e0819b50c74e31b4a027327015e
diff --cc arch/s390/oprofile/init.c
index 6cf2286d0405,bd58b72454cf..2297be406c61
--- a/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