diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
commit | cb2e3d461b26f07540e0b898e0125137def2b015 (patch) | |
tree | a7d3c7f79bd26b15806565405522c7c7c0da44db /init | |
parent | cdc-acm: remove unused element of struct acm (diff) | |
parent | Linux 4.11-rc5 (diff) | |
download | linux-cb2e3d461b26f07540e0b898e0125137def2b015.tar.xz linux-cb2e3d461b26f07540e0b898e0125137def2b015.zip |
Merge 4.11-rc5 into usb-next
We want the usb fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index f9c9d9948203..b0c11cbf5ddf 100644 --- a/init/main.c +++ b/init/main.c @@ -1022,6 +1022,8 @@ static noinline void __init kernel_init_freeable(void) workqueue_init(); + init_mm_internals(); + do_pre_smp_initcalls(); lockup_detector_init(); |