mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "seq_buf: Avoid type mismatch for seq_buf_init"

Browse Source 
This reverts commit d494ddccf2 which is
commit d9a9280a0d upstream.

It breaks the abi definitions, and there's no real need for it at all
other than for "correctness", so revert the thing.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I20ccc2690eca2c16adf507d679fa5e0a6c746e1c
This commit is contained in:
Greg Kroah-Hartman
2020-12-30 15:59:58 +01:00
parent 07ce88e9de
commit d715144232
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/seq_buf.h
View File

@@ -30,7 +30,7 @@ static inline void seq_buf_clear(struct seq_buf *s)
} }
static inline void static inline void
seq_buf_init(struct seq_buf *s, char *buf, unsigned int size) seq_buf_init(struct seq_buf *s, unsigned char *buf, unsigned int size)
{ {
s->buffer = buf; s->buffer = buf;
s->size = size; s->size = size;

4
include/linux/trace_seq.h
View File

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