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

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

# HG changeset patch
# User Keith Coleman <keith.coleman@xxxxxxxxxxxxx>
# Date 1325653517 18000
# Node ID 46f133149343e8b280c9fa687ec65ddd5da83718
# Parent  165f252b04b86bb941dc747f584de9a5432c69fe
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
---


diff -r 165f252b04b8 -r 46f133149343 xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c    Tue Jan 03 20:31:57 2012 -0500
+++ b/xen/arch/x86/cpu/amd.c    Wed Jan 04 00:05:17 2012 -0500
@@ -189,7 +189,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