Merge tag 'printk-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk updates from Petr Mladek: - Herbert Xu made printk header file self-contained. - Andy Shevchenko and Sergey Senozhatsky cleaned up console->setup() error handling. - Andy Shevchenko did some cleanups (e.g. sparse warning) in vsprintf code. - Minor documentation updates. * tag 'printk-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux: lib/vsprintf: Force type of flags value for gfp_t lib/vsprintf: Replace custom spec to print decimals with generic one lib/vsprintf: Replace hidden BUILD_BUG_ON() with static_assert() printk: Make linux/printk.h self-contained doc:kmsg: explicitly state the return value in case of SEEK_CUR Replace HTTP links with HTTPS ones: vsprintf hvc: unify console setup naming console: Fix trivia typo 'change' -> 'chance' console: Propagate error code from console ->setup() tty: hvc: Return proper error code from console ->setup() hook serial: sunzilog: Return proper error code from console ->setup() hook serial: sunsab: Return proper error code from console ->setup() hook mips: Return proper error code from console ->setup() hook
这个提交包含在:
@@ -886,7 +886,7 @@ static int sunsab_console_setup(struct console *con, char *options)
|
||||
* though...
|
||||
*/
|
||||
if (up->port.type != PORT_SUNSAB)
|
||||
return -1;
|
||||
return -EINVAL;
|
||||
|
||||
printk("Console: ttyS%d (SAB82532)\n",
|
||||
(sunsab_reg.minor - 64) + con->index);
|
||||
|
@@ -1221,7 +1221,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
|
||||
int baud, brg;
|
||||
|
||||
if (up->port.type != PORT_SUNZILOG)
|
||||
return -1;
|
||||
return -EINVAL;
|
||||
|
||||
printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n",
|
||||
(sunzilog_reg.minor - 64) + con->index, con->index);
|
||||
|
在新工单中引用
屏蔽一个用户