diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-13 14:20:46 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-13 14:21:04 +0100 |
commit | 56544d29c3a0e383c0d819fefc9570b2803db193 (patch) | |
tree | 4366fc0ba3f5115b8c1c9d171fa245d86e5415d0 /arch/x86/kernel/head32.c | |
parent | 9261dc1de11e158a5f6b4b92c8bf1ef4a02dbf0d (diff) | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
download | talos-op-linux-56544d29c3a0e383c0d819fefc9570b2803db193.tar.gz talos-op-linux-56544d29c3a0e383c0d819fefc9570b2803db193.zip |
Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/head32.c')
-rw-r--r-- | arch/x86/kernel/head32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index d6c1b9836995..2911ef3a9f1c 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c @@ -31,6 +31,7 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) { + cr4_init_shadow(); sanitize_boot_params(&boot_params); /* Call the subarch specific early setup function */ |