lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 359/717] seq_buf: Avoid type mismatch for seq_buf_init
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit d9a9280a0d0ae51dc1d4142138b99242b7ec8ac6 ]

    Building with W=2 prints a number of warnings for one function that
    has a pointer type mismatch:

    linux/seq_buf.h: In function 'seq_buf_init':
    linux/seq_buf.h:35:12: warning: pointer targets in assignment from 'unsigned char *' to 'char *' differ in signedness [-Wpointer-sign]

    Change the type in the function prototype according to the type in
    the structure.

    Link: https://lkml.kernel.org/r/20201026161108.3707783-1-arnd@kernel.org

    Fixes: 9a7777935c34 ("tracing: Convert seq_buf fields to be like seq_file fields")
    Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/seq_buf.h | 2 +-
    include/linux/trace_seq.h | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/include/linux/seq_buf.h b/include/linux/seq_buf.h
    index fb0205d87d3c1..9d6c28cc4d8f2 100644
    --- a/include/linux/seq_buf.h
    +++ b/include/linux/seq_buf.h
    @@ -30,7 +30,7 @@ static inline void seq_buf_clear(struct seq_buf *s)
    }

    static inline void
    -seq_buf_init(struct seq_buf *s, unsigned char *buf, unsigned int size)
    +seq_buf_init(struct seq_buf *s, char *buf, unsigned int size)
    {
    s->buffer = buf;
    s->size = size;
    diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h
    index 6c30508fca198..5a2c650d9e1c1 100644
    --- a/include/linux/trace_seq.h
    +++ b/include/linux/trace_seq.h
    @@ -12,7 +12,7 @@
    */

    struct trace_seq {
    - unsigned char buffer[PAGE_SIZE];
    + char buffer[PAGE_SIZE];
    struct seq_buf seq;
    int full;
    };
    @@ -51,7 +51,7 @@ static inline int trace_seq_used(struct trace_seq *s)
    * that is about to be written to and then return the result
    * of that write.
    */
    -static inline unsigned char *
    +static inline char *
    trace_seq_buffer_ptr(struct trace_seq *s)
    {
    return s->buffer + seq_buf_used(&s->seq);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:19    [W:3.559 / U:2.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site