diff options
| author | Julia Cartwright <julia@ni.com> | 2018-02-26 11:22:02 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-02-26 11:22:02 -0600 |
| commit | 184d107421c695782ae8cc976170e3cf83fbca9a (patch) | |
| tree | 20d804c113e6fbc3a298b069b5a777fb81e194f4 /arch/x86/kernel/cpu/mtrr/generic.c | |
| parent | 90816cc1d4a1d23efe37b74866c6174dd5eab6b5 (diff) | |
| parent | 19c04ca5b239e6e2277a5b381d1e79482ab9bbc5 (diff) | |
| download | linux-rt-184d107421c695782ae8cc976170e3cf83fbca9a.tar.gz | |
Merge tag 'v4.9.84' into v4.9-rt
This is the 4.9.84 stable release
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/generic.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index fdc55215d44d..e12ee86906c6 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c @@ -859,7 +859,7 @@ int generic_validate_add_page(unsigned long base, unsigned long size, */ if (is_cpu(INTEL) && boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 1 && - boot_cpu_data.x86_mask <= 7) { + boot_cpu_data.x86_stepping <= 7) { if (base & ((1 << (22 - PAGE_SHIFT)) - 1)) { pr_warn("mtrr: base(0x%lx000) is not 4 MiB aligned\n", base); return -EINVAL; |