diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:42 +0100 |
| commit | 0c3334d02d93988c106340d85b641e23b9087abb (patch) | |
| tree | e96abc7617cfc2125be89ca765e86cdd9a1f06cd /arch/x86/kernel/cpu/mtrr/main.c | |
| parent | 09e05e96cbb3e437b919a99b29ed0e59db9724cb (diff) | |
| parent | d9227958dc0e56976eaf452a213aee8415a9eb60 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.06-rt
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/main.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index fa77ac8291f0..f924f41af89a 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c @@ -682,7 +682,7 @@ void __init mtrr_bp_init(void) phys_addr = 32; - if (cpu_has_mtrr) { + if (boot_cpu_has(X86_FEATURE_MTRR)) { mtrr_if = &generic_mtrr_ops; size_or_mask = SIZE_OR_MASK_BITS(36); size_and_mask = 0x00f00000; |