[Xen-changelog] [xen-4.1-testing] x86/AMD: use correct shift count when merging model and stepping

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1324219544 0
# Node ID c62738ea1bb4dd183b94127e4bcc4586514101f9
# Parent  bb365e21314d2900fe1a4cf4e80ed1251a9c835b
x86/AMD: use correct shift count when merging model and stepping

... for legacy errata matching.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
xen-unstable changeset:   24412:99caac2e35df
xen-unstable date:        Thu Dec 15 14:28:45 2011 +0100
Committed-by: Keir Fraser <keir@xxxxxxx>
---


diff -r bb365e21314d -r c62738ea1bb4 xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c    Thu Dec 15 11:20:19 2011 +0000
+++ b/xen/arch/x86/cpu/amd.c    Sun Dec 18 14:45:44 2011 +0000
@@ -216,7 +216,7 @@
        }
 
        /* 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)) &&

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog