mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cris: use simple_read_from_buffer() 

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Akinobu Mita 2008-07-23 21:28:46 -07:00 committed by Linus Torvalds
parent d50004b086
commit ed62f77bb6
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/cris/kernel/profile.c
View File

@ -35,19 +35,16 @@ read_cris_profile(struct file *file, char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
unsigned long p = *ppos; unsigned long p = *ppos;
ssize_t ret;
if (p > SAMPLE_BUFFER_SIZE) ret = simple_read_from_buffer(buf, count, ppos, sample_buffer,
return 0; SAMPLE_BUFFER_SIZE);
if (ret < 0)
return ret;
if (p + count > SAMPLE_BUFFER_SIZE) memset(sample_buffer + p, 0, ret);
count = SAMPLE_BUFFER_SIZE - p;
if (copy_to_user(buf, sample_buffer + p,count))
return -EFAULT;
memset(sample_buffer + p, 0, count); return ret;
*ppos += count;
return count;
} }
static ssize_t static ssize_t