Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7151442 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "seq_buf: Avoid type mismatch for seq_buf_init" 



This reverts commit d494ddcc which is
commit d9a9280a0d0ae51dc1d4142138b99242b7ec8ac6 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I20ccc2690eca2c16adf507d679fa5e0a6c746e1c
parent 07ce88e9

include/linux/seq_buf.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static inline void seq_buf_clear(struct seq_buf *s) 
}



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->size = size;

include/linux/trace_seq.h

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 */



struct trace_seq {

	char			buffer[PAGE_SIZE];

	unsigned 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 char *

static inline unsigned char *

trace_seq_buffer_ptr(struct trace_seq *s)

{

	return s->buffer + seq_buf_used(&s->seq);