lkml.org 
[lkml]   [2009]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 1/7] trace: make 'mem' argument of trace_seq_putmem() const
    I passed a const value to trace_seq_putmem(), and I got compile warning.

    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    ---
    kernel/trace/trace_output.c | 6 +++---
    kernel/trace/trace_output.h | 5 +++--
    2 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
    index 6595074..d72b9a6 100644
    --- a/kernel/trace/trace_output.c
    +++ b/kernel/trace/trace_output.c
    @@ -137,7 +137,7 @@ int trace_seq_putc(struct trace_seq *s, unsigned char c)
    return 1;
    }

    -int trace_seq_putmem(struct trace_seq *s, void *mem, size_t len)
    +int trace_seq_putmem(struct trace_seq *s, const void *mem, size_t len)
    {
    if (len > ((PAGE_SIZE - 1) - s->len))
    return 0;
    @@ -148,10 +148,10 @@ int trace_seq_putmem(struct trace_seq *s, void *mem, size_t len)
    return len;
    }

    -int trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
    +int trace_seq_putmem_hex(struct trace_seq *s, const void *mem, size_t len)
    {
    unsigned char hex[HEX_CHARS];
    - unsigned char *data = mem;
    + const unsigned char *data = mem;
    int i, j;

    #ifdef __BIG_ENDIAN
    diff --git a/kernel/trace/trace_output.h b/kernel/trace/trace_output.h
    index 46fb961..e0bde39 100644
    --- a/kernel/trace/trace_output.h
    +++ b/kernel/trace/trace_output.h
    @@ -31,8 +31,9 @@ extern ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
    size_t cnt);
    extern int trace_seq_puts(struct trace_seq *s, const char *str);
    extern int trace_seq_putc(struct trace_seq *s, unsigned char c);
    -extern int trace_seq_putmem(struct trace_seq *s, void *mem, size_t len);
    -extern int trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len);
    +extern int trace_seq_putmem(struct trace_seq *s, const void *mem, size_t len);
    +extern int trace_seq_putmem_hex(struct trace_seq *s, const void *mem,
    + size_t len);
    extern void *trace_seq_reserve(struct trace_seq *s, size_t len);
    extern int trace_seq_path(struct trace_seq *s, struct path *path);
    extern int seq_print_userip_objs(const struct userstack_entry *entry,
    --
    1.5.4.rc3




    \
     
     \ /
      Last update: 2009-03-27 06:43    [W:0.038 / U:30.948 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site