]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
seq_buf: Avoid type mismatch for seq_buf_init
authorArnd Bergmann <arnd@arndb.de>
Mon, 26 Oct 2020 16:10:58 +0000 (17:10 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 20 Jan 2021 13:26:01 +0000 (14:26 +0100)
BugLink: https://bugs.launchpad.net/bugs/1910822
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
include/linux/seq_buf.h
include/linux/trace_seq.h

index aa5deb041c25d4796c8efa021de3c40d17483913..7cc952282e8bec38521e37051af559e3b7f20971 100644 (file)
@@ -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;
index 6609b39a723261cf9e0dc3afc154f28d66f98ce2..6db257466af68133a6b870922a637661d492df78 100644 (file)
@@ -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);