diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
| commit | b48741cce3be32a48af9a2b272f3f13a077375cf (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/s390 | |
| parent | 54b6c82ac9a124804816f244f587c0f40d25ad01 (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
Merge branch 'samsung/cleanup' into next/cleanup2
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/cputime.h | 2 | ||||
| -rw-r--r-- | arch/s390/oprofile/init.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h index 08143487829..b9acaaa175d 100644 --- a/arch/s390/include/asm/cputime.h +++ b/arch/s390/include/asm/cputime.h @@ -87,6 +87,8 @@ usecs_to_cputime(const unsigned int m) return (cputime_t) m * 4096; } +#define usecs_to_cputime64(m) usecs_to_cputime(m) + /* * Convert cputime to milliseconds and back. */ diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c index 6efc18b5e60..bd58b72454c 100644 --- a/arch/s390/oprofile/init.c +++ b/arch/s390/oprofile/init.c @@ -88,7 +88,7 @@ static ssize_t hwsampler_write(struct file *file, char const __user *buf, return -EINVAL; retval = oprofilefs_ulong_from_user(&val, buf, count); - if (retval) + if (retval <= 0) return retval; if (oprofile_started) |