diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2020-01-10 18:53:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2020-01-10 18:53:14 +0100 |
| commit | 57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e (patch) | |
| tree | eaa43171e82737e8b33239e2e9bc3b4de67b7ddd /arch/x86/include/asm/mtrr.h | |
| parent | Merge branch 'linus' into efi/core, to pick up fixes (diff) | |
| parent | mm, x86/mm: Untangle address space layout definitions from basic pgtable type... (diff) | |
| download | linux-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.tar.gz linux-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.tar.bz2 linux-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.zip | |
Merge branch 'x86/mm' into efi/core, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/mtrr.h')
| -rw-r--r-- | arch/x86/include/asm/mtrr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index dbff1456d215..829df26fd7a3 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -24,7 +24,7 @@ #define _ASM_X86_MTRR_H #include <uapi/asm/mtrr.h> -#include <asm/pat.h> +#include <asm/memtype.h> /* @@ -86,7 +86,7 @@ static inline void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) } static inline void mtrr_bp_init(void) { - pat_disable("MTRRs disabled, skipping PAT initialization too."); + pat_disable("PAT support disabled because CONFIG_MTRR is disabled in the kernel."); } #define mtrr_ap_init() do {} while (0) |