diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index e67b834279b2..bbaae4cf9e8e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -112,6 +112,7 @@ | |||
112 | #include <asm/alternative.h> | 112 | #include <asm/alternative.h> |
113 | #include <asm/prom.h> | 113 | #include <asm/prom.h> |
114 | #include <asm/microcode.h> | 114 | #include <asm/microcode.h> |
115 | #include <asm/kaiser.h> | ||
115 | 116 | ||
116 | /* | 117 | /* |
117 | * max_low_pfn_mapped: highest direct mapped pfn under 4GB | 118 | * max_low_pfn_mapped: highest direct mapped pfn under 4GB |
@@ -1016,6 +1017,12 @@ void __init setup_arch(char **cmdline_p) | |||
1016 | */ | 1017 | */ |
1017 | init_hypervisor_platform(); | 1018 | init_hypervisor_platform(); |
1018 | 1019 | ||
1020 | /* | ||
1021 | * This needs to happen right after XENPV is set on xen and | ||
1022 | * kaiser_enabled is checked below in cleanup_highmap(). | ||
1023 | */ | ||
1024 | kaiser_check_boottime_disable(); | ||
1025 | |||
1019 | x86_init.resources.probe_roms(); | 1026 | x86_init.resources.probe_roms(); |
1020 | 1027 | ||
1021 | /* after parse_early_param, so could debug it */ | 1028 | /* after parse_early_param, so could debug it */ |