xcp-1.6-updates/xen-4.1.hg

changeset 23203:c62738ea1bb4

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>
author Jan Beulich <jbeulich@suse.com>
date Sun Dec 18 14:45:44 2011 +0000 (2011-12-18)
parents bb365e21314d
children 6ccf1820fb94
files xen/arch/x86/cpu/amd.c
line diff
     1.1 --- a/xen/arch/x86/cpu/amd.c	Thu Dec 15 11:20:19 2011 +0000
     1.2 +++ b/xen/arch/x86/cpu/amd.c	Sun Dec 18 14:45:44 2011 +0000
     1.3 @@ -216,7 +216,7 @@ int cpu_has_amd_erratum(const struct cpu
     1.4  	}
     1.5  
     1.6  	/* OSVW unavailable or ID unknown, match family-model-stepping range */
     1.7 -	ms = (cpu->x86_model << 8) | cpu->x86_mask;
     1.8 +	ms = (cpu->x86_model << 4) | cpu->x86_mask;
     1.9  	while ((range = va_arg(ap, int))) {
    1.10  		if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) &&
    1.11  		    (ms >= AMD_MODEL_RANGE_START(range)) &&