diff options
author | Jan Beulich <jbeulich@suse.com> | 2011-12-18 14:49:59 +0000 |
---|---|---|
committer | Jan Beulich <jbeulich@suse.com> | 2011-12-18 14:49:59 +0000 |
commit | 66674eaaf1ef0c6ad273b11638c101829c31dd4d (patch) | |
tree | afe2494b65738f7fc9b0c2d197f12035937b050a | |
parent | 587a2baa6558c92299437a48cbb4f69eead05846 (diff) | |
download | xen-66674eaaf1ef0c6ad273b11638c101829c31dd4d.tar.gz xen-66674eaaf1ef0c6ad273b11638c101829c31dd4d.tar.bz2 xen-66674eaaf1ef0c6ad273b11638c101829c31dd4d.zip |
x86/AMD: use correct shift count when merging model and stepping
... for legacy errata matching.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 24412:99caac2e35df
xen-unstable date: Thu Dec 15 14:28:45 2011 +0100
Committed-by: Keir Fraser <keir@xen.org>
-rw-r--r-- | xen/arch/x86/cpu/amd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index d0c0b1602f..d1cb546543 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -231,7 +231,7 @@ int cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, int osvw, ...) } /* OSVW unavailable or ID unknown, match family-model-stepping range */ - ms = (cpu->x86_model << 8) | cpu->x86_mask; + ms = (cpu->x86_model << 4) | cpu->x86_mask; while ((range = va_arg(ap, int))) { if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) && (ms >= AMD_MODEL_RANGE_START(range)) && |