diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:21 +0800 |
| commit | ba0cfa06c512552bdba8264b46b006478253f39b (patch) | |
| tree | 803ecd2eddc27a45fe41691a2ac058f59051fe9d /kernel | |
| parent | 26c815656d14b133b04936f384f5a55fceb2e835 (diff) | |
| parent | aedb4a24b9ae4fbd6ced45ae64ae3d84b423f5c2 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 2 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index e8af73cc51a7..beb042dcc332 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3199,4 +3199,4 @@ static int __init futex_init(void) return 0; } -__initcall(futex_init); +core_initcall(futex_init); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index e7e586bb2022..1a698158face 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1440,7 +1440,7 @@ static void call_console_drivers(int level, { struct console *con; - trace_console(text, len); + trace_console_rcuidle(text, len); if (level >= console_loglevel && !ignore_loglevel) return; |