diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-05 02:28:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-05 02:29:12 -0400 |
| commit | e4390fa632d7c592e68e8106b7daea923ac995f5 (patch) | |
| tree | e09863306a611c97e17fc04e92b9dcc38df9b553 /arch | |
| parent | 500ad2d8b01390c98bc6dce068bccfa9534b8212 (diff) | |
| parent | 81ff3478d9ba7f0b48b0abef740e542fd83adf79 (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Pull s390 oprofile fix from Robert Richter.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/oprofile/init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c index a1e9d69a9c9..584b93674ea 100644 --- a/arch/s390/oprofile/init.c +++ b/arch/s390/oprofile/init.c | |||
| @@ -169,7 +169,7 @@ static ssize_t hw_interval_write(struct file *file, char const __user *buf, | |||
| 169 | if (*offset) | 169 | if (*offset) |
| 170 | return -EINVAL; | 170 | return -EINVAL; |
| 171 | retval = oprofilefs_ulong_from_user(&val, buf, count); | 171 | retval = oprofilefs_ulong_from_user(&val, buf, count); |
| 172 | if (retval) | 172 | if (retval <= 0) |
| 173 | return retval; | 173 | return retval; |
| 174 | if (val < oprofile_min_interval) | 174 | if (val < oprofile_min_interval) |
| 175 | oprofile_hw_interval = oprofile_min_interval; | 175 | oprofile_hw_interval = oprofile_min_interval; |
| @@ -212,7 +212,7 @@ static ssize_t hwsampler_zero_write(struct file *file, char const __user *buf, | |||
| 212 | return -EINVAL; | 212 | return -EINVAL; |
| 213 | 213 | ||
| 214 | retval = oprofilefs_ulong_from_user(&val, buf, count); | 214 | retval = oprofilefs_ulong_from_user(&val, buf, count); |
| 215 | if (retval) | 215 | if (retval <= 0) |
| 216 | return retval; | 216 | return retval; |
| 217 | if (val != 0) | 217 | if (val != 0) |
| 218 | return -EINVAL; | 218 | return -EINVAL; |
| @@ -243,7 +243,7 @@ static ssize_t hwsampler_kernel_write(struct file *file, char const __user *buf, | |||
| 243 | return -EINVAL; | 243 | return -EINVAL; |
| 244 | 244 | ||
| 245 | retval = oprofilefs_ulong_from_user(&val, buf, count); | 245 | retval = oprofilefs_ulong_from_user(&val, buf, count); |
| 246 | if (retval) | 246 | if (retval <= 0) |
| 247 | return retval; | 247 | return retval; |
| 248 | 248 | ||
| 249 | if (val != 0 && val != 1) | 249 | if (val != 0 && val != 1) |
| @@ -278,7 +278,7 @@ static ssize_t hwsampler_user_write(struct file *file, char const __user *buf, | |||
| 278 | return -EINVAL; | 278 | return -EINVAL; |
| 279 | 279 | ||
| 280 | retval = oprofilefs_ulong_from_user(&val, buf, count); | 280 | retval = oprofilefs_ulong_from_user(&val, buf, count); |
| 281 | if (retval) | 281 | if (retval <= 0) |
| 282 | return retval; | 282 | return retval; |
| 283 | 283 | ||
| 284 | if (val != 0 && val != 1) | 284 | if (val != 0 && val != 1) |
| @@ -317,7 +317,7 @@ static ssize_t timer_enabled_write(struct file *file, char const __user *buf, | |||
| 317 | return -EINVAL; | 317 | return -EINVAL; |
| 318 | 318 | ||
| 319 | retval = oprofilefs_ulong_from_user(&val, buf, count); | 319 | retval = oprofilefs_ulong_from_user(&val, buf, count); |
| 320 | if (retval) | 320 | if (retval <= 0) |
| 321 | return retval; | 321 | return retval; |
| 322 | 322 | ||
| 323 | if (val != 0 && val != 1) | 323 | if (val != 0 && val != 1) |