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

torvalds · torvalds · commit 0f4022a490ad · 2021-06-18T10:50:41.000-07:00
Pull printk fixup from Petr Mladek:
 "Fix misplaced EXPORT_SYMBOL(vsprintf)"

* tag 'printk-for-5.13-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: Move EXPORT_SYMBOL() closer to vprintk definition
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
@@ -391,6 +391,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 	/* No obstacles. */
 	return vprintk_default(fmt, args);
 }
+EXPORT_SYMBOL(vprintk);
 
 void __init printk_safe_init(void)
 {
@@ -411,4 +412,3 @@ void __init printk_safe_init(void)
 	/* Flush pending messages that did not have scheduled IRQ works. */
 	printk_safe_flush();
 }
-EXPORT_SYMBOL(vprintk);

Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)`
`391`	`391`	`/* No obstacles. */`
`392`	`392`	`return vprintk_default(fmt, args);`
`393`	`393`	`}`
	`394`	`+EXPORT_SYMBOL(vprintk);`
`394`	`395`
`395`	`396`	`void __init printk_safe_init(void)`
`396`	`397`	`{`
`@@ -411,4 +412,3 @@ void __init printk_safe_init(void)`
`411`	`412`	`/* Flush pending messages that did not have scheduled IRQ works. */`
`412`	`413`	`printk_safe_flush();`
`413`	`414`	`}`
`414`		`-EXPORT_SYMBOL(vprintk);`