diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-29 12:04:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-29 12:04:17 -0700 |
| commit | 25c69bf35b1a493ab8c8aca28afd9bb9d0d5d26c (patch) | |
| tree | b186b8c104e3e94d06dc31d8305c47d6a8995194 /arch/x86/kernel/cpu/mtrr/main.c | |
| parent | ae8a7e6903c2a6201226b3aabb0d7673c6a5f042 (diff) | |
| parent | 563a330876f64f5289d0886857947c7bd469f907 (diff) | |
Merge "Merge android-4.4.138 (07c0138) into msm-4.4"
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; |