seq-buf: Make seq_buf_bprintf() conditional on CONFIG_BINARY_PRINTF (2448913e) · Commits · 戴 / test

The function bstr_printf() from lib/vsprnintf.c is only available if CONFIG_BINARY_PRINTF is defined. This is due to the only user currently being the tracing infrastructure, which needs to select this config when tracing is configured. Until there is another user of the binary printf formats, this will continue to be the case. Since seq_buf.c is now lives in lib/ and is compiled even without tracing, it must encompass its use of bstr_printf() which is used by seq_buf_printf(). This too is only used by the tracing infrastructure and is still encapsulated by the CONFIG_BINARY_PRINTF. Link: http://lkml.kernel.org/r/20141104160222.969013383@goodmis.org Tested-by:

Jiri Kosina <jkosina@suse.cz> Acked-by:

Jiri Kosina <jkosina@suse.cz> Reviewed-by:

Petr Mladek <pmladek@suse.cz> Signed-off-by:

Steven Rostedt <rostedt@goodmis.org>

include/linux/seq_buf.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -115,8 +115,6 @@ extern __printf(2, 3)
		int seq_buf_printf(struct seq_buf s, const char fmt, ...);
		extern __printf(2, 0)
		int seq_buf_vprintf(struct seq_buf s, const char fmt, va_list args);
		extern int
		seq_buf_bprintf(struct seq_buf s, const char fmt, const u32 *binary);
		extern int seq_buf_print_seq(struct seq_file m, struct seq_buf s);
		extern int seq_buf_to_user(struct seq_buf s, char __user ubuf,
		int cnt);
		@@ -130,4 +128,9 @@ extern int seq_buf_path(struct seq_buf s, const struct path path, const char *
		extern int seq_buf_bitmask(struct seq_buf s, const unsigned long maskp,
		int nmaskbits);

		#ifdef CONFIG_BINARY_PRINTF
		extern int
		seq_buf_bprintf(struct seq_buf s, const char fmt, const u32 *binary);
		#endif

		#endif /* _LINUX_SEQ_BUF_H */

kernel/trace/seq_buf.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ int seq_buf_bitmask(struct seq_buf s, const unsigned long maskp,
		return -1;
		}

		#ifdef CONFIG_BINARY_PRINTF
		/**
		* seq_buf_bprintf - Write the printf string from binary arguments
		* @s: seq_buf descriptor
		@@ -161,6 +162,7 @@ int seq_buf_bprintf(struct seq_buf s, const char fmt, const u32 *binary)
		seq_buf_set_overflow(s);
		return -1;
		}
		#endif /* CONFIG_BINARY_PRINTF */

		/**
		* seq_buf_puts - sequence printing of simple string

Admin message