diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:33 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:33 +0800 |
| commit | 156f7b56ee4b918b95991750e0f34da8ad416eae (patch) | |
| tree | fd47da260b3c78631721f36edf01b2878358283a /kernel/printk/printk.c | |
| parent | 2e2fb031287a5946d97b85769f80ca60f0166e15 (diff) | |
| parent | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-17.06-rtlsk-v4.1-17.05-rtlsk-v4.1-17.03-rt
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 398bf2bbd3bc..1f8c372774e1 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1419,7 +1419,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; |