diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
| commit | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (patch) | |
| tree | 1a24a0ad0c33e1d6344d2454b61748afb74a6693 /kernel/printk/printk.c | |
| parent | cb370744bc101be91a0bc3e9fbdb670ab44df97d (diff) | |
| parent | d9e0350d2575a20ee7783427da9bd6b6107eb983 (diff) | |
Merge tag 'v4.1.39' into linux-linaro-lsk-v4.1lsk-v4.1-17.03
This is the 4.1.39 stable release
Diffstat (limited to 'kernel/printk/printk.c')
| -rw-r--r-- | kernel/printk/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 3c1aca0c3543..59dc17ba820b 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1394,7 +1394,7 @@ static void call_console_drivers(int level, const char *text, size_t len) { struct console *con; - trace_console(text, len); + trace_console_rcuidle(text, len); if (level >= console_loglevel && !ignore_loglevel) return; |