diff options
| author | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
| commit | 223a1a424ccc1a22fa77500bb1bced246d5dd855 (patch) | |
| tree | 35a62e7275ac840c7b20faa8cc40fe9798bcc950 /init | |
| parent | 0c37397b6b8708f3cae24a8faeed2d1c84760892 (diff) | |
| parent | 7bbc6ca4887794cc44b41412a35bdfbe0cbd1c50 (diff) | |
Merge tag 'v4.9.76' into v4.9-rt
This is the 4.9.76 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 a4a61e7d2248..48ffaaad8ac9 100644 --- a/init/main.c +++ b/init/main.c @@ -80,6 +80,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> @@ -473,6 +474,7 @@ static void __init mm_init(void) pgtable_init(); vmalloc_init(); ioremap_huge_init(); + kaiser_init(); } asmlinkage __visible void __init start_kernel(void) |