lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 12 Feb 2019 15:29:52 +0100 From: John Ogness <john.ogness@...utronix.de> To: linux-kernel@...r.kernel.org Cc: Peter Zijlstra <peterz@...radead.org>, Petr Mladek <pmladek@...e.com>, Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>, Steven Rostedt <rostedt@...dmis.org>, Daniel Wang <wonderfly@...gle.com>, Andrew Morton <akpm@...ux-foundation.org>, Linus Torvalds <torvalds@...ux-foundation.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Alan Cox <gnomes@...rguk.ukuu.org.uk>, Jiri Slaby <jslaby@...e.com>, Peter Feiner <pfeiner@...gle.com>, linux-serial@...r.kernel.org, Sergey Senozhatsky <sergey.senozhatsky@...il.com> Subject: [RFC PATCH v1 14/25] printk: do boot_delay_msec inside printk_delay Both functions needed to be called one after the other, so just integrate boot_delay_msec into printk_delay for simplification. Signed-off-by: John Ogness <john.ogness@...utronix.de> --- kernel/printk/printk.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ebd9aac06323..897219f34cab 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1453,6 +1453,21 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) return do_syslog(type, buf, len, SYSLOG_FROM_READER); } +int printk_delay_msec __read_mostly; + +static inline void printk_delay(int level) +{ + boot_delay_msec(level); + if (unlikely(printk_delay_msec)) { + int m = printk_delay_msec; + + while (m--) { + mdelay(1); + touch_nmi_watchdog(); + } + } +} + static void print_console_dropped(struct console *con, u64 count) { char text[64]; @@ -1534,20 +1549,6 @@ static void call_console_drivers(u64 seq, const char *ext_text, size_t ext_len, } } -int printk_delay_msec __read_mostly; - -static inline void printk_delay(void) -{ - if (unlikely(printk_delay_msec)) { - int m = printk_delay_msec; - - while (m--) { - mdelay(1); - touch_nmi_watchdog(); - } - } -} - /* FIXME: no support for LOG_CONT */ #if 0 /* @@ -2506,10 +2507,8 @@ static int printk_kthread_func(void *data) console_lock(); call_console_drivers(master_seq, ext_text, ext_len, text, len); - if (len > 0 || ext_len > 0) { - boot_delay_msec(msg->level); - printk_delay(); - } + if (len > 0 || ext_len > 0) + printk_delay(msg->level); console_unlock(); } -- 2.11.0
Powered by blists - more mailing lists