Merge tag 'printk-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk (7011b7e1) · Commits · 戴 / test

Pull printk updates from Petr Mladek: - distinguish different legacy clocks again - small clean up * tag 'printk-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk: lib/vsprintf: Reinstate printing of legacy clock IDs vsprintf: fix data type of variable in string_nocheck()

lib/vsprintf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -599,7 +599,7 @@ static char string_nocheck(char buf, char end, const char s,
		struct printf_spec spec)
		{
		int len = 0;
		size_t lim = spec.precision;
		int lim = spec.precision;

		while (lim--) {
		char c = *s++;
		@@ -1799,7 +1799,7 @@ char clock(char buf, char end, struct clk clk, struct printf_spec spec,
		#ifdef CONFIG_COMMON_CLK
		return string(buf, end, __clk_get_name(clk), spec);
		#else
		return error_string(buf, end, "(%pC?)", spec);
		return ptr_to_id(buf, end, clk, spec);
		#endif
		}
		}

Admin message