diff options
| author |   Christoph Hellwig <hch@lst.de> | 2021-12-15 17:56:11 +0100 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2021-12-22 19:50:26 +0100 |
| commit | 4d5cff69fbddbbefef2903faa48263cc5d3ca382 (patch) | |
| tree | 73c3658b7700ccd9eeb34799d4f2c49c1097e4c0 /arch/x86/kernel | |
| parent | x86/sev-es: Use insn_decode_mmio() for MMIO implementation (diff) | |
| download | linux-dev-4d5cff69fbddbbefef2903faa48263cc5d3ca382.tar.xz linux-dev-4d5cff69fbddbbefef2903faa48263cc5d3ca382.zip | |
x86/mtrr: Remove the mtrr_bp_init() stub
Add an IS_ENABLED() check in setup_arch() and call pat_disable()
directly if MTRRs are not supported. This allows to remove the
<asm/memtype.h> include in <asm/mtrr.h>, which pull in lowlevel x86
headers that should not be included for UML builds and will cause build
warnings with a following patch.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211215165612.554426-2-hch@lst.de
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/setup.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 6a190c7f4d71..2f5129bd49dc 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -40,6 +40,7 @@ #include <asm/kasan.h> #include <asm/kaslr.h> #include <asm/mce.h> +#include <asm/memtype.h> #include <asm/mtrr.h> #include <asm/realmode.h> #include <asm/olpc_ofw.h> @@ -979,7 +980,11 @@ void __init setup_arch(char **cmdline_p) max_pfn = e820__end_of_ram_pfn(); /* update e820 for memory not covered by WB MTRRs */ - mtrr_bp_init(); + if (IS_ENABLED(CONFIG_MTRR)) + mtrr_bp_init(); + else + pat_disable("PAT support disabled because CONFIG_MTRR is disabled in the kernel."); + if (mtrr_trim_uncached_memory(max_pfn)) max_pfn = e820__end_of_ram_pfn(); |