lkml.org 
[lkml]   [2019]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v1 14/25] printk: do boot_delay_msec inside printk_delay
    Date
    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@linutronix.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
    \
     
     \ /
      Last update: 2019-02-12 15:32    [W:4.405 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site