Merge branch 'printk-rework' into for-linus

2020-10-12 13:01:37 +02:00
parent 4e797e6ec7 0463d04ea0
commit 70333f4ff9
16 changed files with 3410 additions and 732 deletions
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -161,10 +161,12 @@ static inline void printk_nmi_direct_enter(void) { }
 static inline void printk_nmi_direct_exit(void) { }
 #endif /* PRINTK_NMI */

+struct dev_printk_info;
+
 #ifdef CONFIG_PRINTK
-asmlinkage __printf(5, 0)
+asmlinkage __printf(4, 0)
 int vprintk_emit(int facility, int level,
-		 const char *dict, size_t dictlen,
+		 const struct dev_printk_info *dev_info,
 		 const char *fmt, va_list args);

 asmlinkage __printf(1, 0)