Commit af54a3a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'printk-for-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux 

Pull more printk updates from Petr Mladek:

 - Silence warnings about candidates for ‘gnu_print’ format attribute

* tag 'printk-for-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  vsnprintf: Silence false positive GCC warning for va_format()
  vsnprintf: Drop unused const char fmt * in va_format()
  vsnprintf: Mark binary printing functions with __printf() attribute
  tracing: Mark binary printing functions with __printf() attribute
  seq_file: Mark binary printing functions with __printf() attribute
  seq_buf: Mark binary printing functions with __printf() attribute
parents da0512b2 bd67c1c3

include/linux/seq_buf.h

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ extern int seq_buf_hex_dump(struct seq_buf *s, const char *prefix_str, 
			    const void *buf, size_t len, bool ascii);



#ifdef CONFIG_BINARY_PRINTF

extern int

seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary);

__printf(2, 0)

int seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary);

#endif



void seq_buf_do_printk(struct seq_buf *s, const char *lvl);

include/linux/seq_file.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ int seq_open_private(struct file *, const struct seq_operations *, int); 
int seq_release_private(struct inode *, struct file *);



#ifdef CONFIG_BINARY_PRINTF

__printf(2, 0)

void seq_bprintf(struct seq_file *m, const char *f, const u32 *binary);

#endif

include/linux/string.h

+2 −2
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ int __sysfs_match_string(const char * const *array, size_t n, const char *s); 
#define sysfs_match_string(_a, _s) __sysfs_match_string(_a, ARRAY_SIZE(_a), _s)



#ifdef CONFIG_BINARY_PRINTF

int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);

int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);

__printf(3, 0) int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);

__printf(3, 0) int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);

#endif



extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,

include/linux/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ static inline int unregister_ftrace_export(struct trace_export *export) 
static inline void trace_printk_init_buffers(void)

{

}

static inline int trace_array_printk(struct trace_array *tr, unsigned long ip,

				     const char *fmt, ...)

static inline __printf(3, 4)

int trace_array_printk(struct trace_array *tr, unsigned long ip, const char *fmt, ...)

{

	return 0;

}

include/linux/trace_seq.h

+4 −4
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ extern __printf(2, 3) 
void trace_seq_printf(struct trace_seq *s, const char *fmt, ...);

extern __printf(2, 0)

void trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args);

extern void

trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);

extern __printf(2, 0)

void trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);

extern int trace_print_seq(struct seq_file *m, struct trace_seq *s);

extern int trace_seq_to_user(struct trace_seq *s, char __user *ubuf,

			     int cnt);
@@ -113,8 +113,8 @@ static inline __printf(2, 3) 
void trace_seq_printf(struct trace_seq *s, const char *fmt, ...)

{

}

static inline void

trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary)

static inline __printf(2, 0)

void trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary)

{

}