Merge branch 'core/printk' into tracing/ftrace (546e5354) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/kernel.h

+17 −0

Original line number	Diff line number	Diff line
		@@ -242,6 +242,19 @@ extern struct ratelimit_state printk_ratelimit_state;
		extern int printk_ratelimit(void);
		extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
		unsigned int interval_msec);

		/*
		* Print a one-time message (analogous to WARN_ONCE() et al):
		*/
		#define printk_once(x...) ({ \
		static int __print_once = 1; \
		\
		if (__print_once) { \
		__print_once = 0; \
		printk(x); \
		} \
		})

		#else
		static inline int vprintk(const char *s, va_list args)
		__attribute__ ((format (printf, 1, 0)));
		@@ -253,6 +266,10 @@ static inline int printk_ratelimit(void) { return 0; }
		static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \
		unsigned int interval_msec) \
		{ return false; }

		/* No effect, but we still get type checking even in the !PRINTK case: */
		#define printk_once(x...) printk(x)

		#endif

		extern int printk_needs_cpu(int cpu);

+7 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include <linux/compiler.h> /* for inline */
		#include <linux/types.h> /* for size_t */
		#include <linux/stddef.h> /* for NULL */
		#include <stdarg.h>

		extern char strndup_user(const char __user , long);

		@@ -111,6 +112,12 @@ extern void argv_free(char **argv);

		extern bool sysfs_streq(const char s1, const char s2);

		#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);
		int bprintf(u32 bin_buf, size_t size, const char fmt, ...) __printf(3, 4);
		#endif

		extern ssize_t memory_read_from_buffer(void to, size_t count, loff_t ppos,
		const void *from, size_t available);

+3 −0