lkml.org 
[lkml]   [2008]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch -v3 11/22] 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>
    Cc: dev-etrax@axis.com
    ---
    arch/cris/kernel/profile.c | 17 +++++++----------
    1 file changed, 7 insertions(+), 10 deletions(-)

    Index: 2.6-git/arch/cris/kernel/profile.c
    ===================================================================
    --- 2.6-git.orig/arch/cris/kernel/profile.c
    +++ 2.6-git/arch/cris/kernel/profile.c
    @@ -35,19 +35,16 @@ read_cris_profile(struct file *file, cha
    size_t count, loff_t *ppos)
    {
    unsigned long p = *ppos;
    + ssize_t ret;

    - if (p > SAMPLE_BUFFER_SIZE)
    - return 0;
    + ret = simple_read_from_buffer(buf, count, ppos, sample_buffer,
    + SAMPLE_BUFFER_SIZE);
    + if (ret < 0)
    + return ret;

    - if (p + count > SAMPLE_BUFFER_SIZE)
    - count = SAMPLE_BUFFER_SIZE - p;
    - if (copy_to_user(buf, sample_buffer + p,count))
    - return -EFAULT;
    + memset(sample_buffer + p, 0, ret);

    - memset(sample_buffer + p, 0, count);
    - *ppos += count;
    -
    - return count;
    + return ret;
    }

    static ssize_t
    --


    \
     
     \ /
      Last update: 2008-06-04 14:17    [W:0.056 / U:0.176 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site