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

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

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1324219799 0
# Node ID 47bec9555bb4f6b10d9c7e57affc2401287c7f99
# Parent  beabf510c4a1cec1c91049284b2fc1b879fec456
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 beabf510c4a1 -r 47bec9555bb4 xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c    Tue Dec 06 10:54:42 2011 +0000
+++ b/xen/arch/x86/cpu/amd.c    Sun Dec 18 14:49:59 2011 +0000
@@ -231,7 +231,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