diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-08 12:01:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-08 12:01:03 +0800 |
| commit | 9c95ff4010dad00b22cc2cc32cad952059f59bd7 (patch) | |
| tree | 5724c8b4340c675320f7774673619c82a557cc7f /init | |
| parent | 95d4cbea0249e2fe483a981024501cdf7b0de55b (diff) | |
| parent | b3e3db15b45027e3b77ec7f722e2b7210b1bf726 (diff) | |
Merge tag 'v4.4.110' into linux-linaro-lsk-v4.4
This is the 4.4.110 stable release
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 fbafa271531c..fc9ee1295f83 100644 --- a/init/main.c +++ b/init/main.c @@ -81,6 +81,7 @@ #include <linux/integrity.h> #include <linux/proc_ns.h> #include <linux/io.h> +#include <linux/kaiser.h> #include <asm/io.h> #include <asm/bugs.h> @@ -489,6 +490,7 @@ static void __init mm_init(void) pgtable_init(); vmalloc_init(); ioremap_huge_init(); + kaiser_init(); } asmlinkage __visible void __init start_kernel(void) |