fhandler_proc.cc(format_proc_cpuinfo): or model extension bits

or model extension bits into model high bits instead of adding
arithmetically like family extension.
This commit is contained in:
Brian Inglis 2019-10-07 10:23:07 -06:00 committed by Ken Brown
parent 8cf614a88b
commit 2160c52a49

View File

@ -740,7 +740,7 @@ format_proc_cpuinfo (void *, char *&destbuf)
if (family == 15)
family += (cpuid_sig >> 20) & 0xff;
if (family >= 6)
model += ((cpuid_sig >> 16) & 0x0f) << 4;
model |= ((cpuid_sig >> 16) & 0x0f) << 4; /* ext model << 4 | model */
uint32_t maxe = 0;
cpuid (&maxe, &unused, &unused, &unused, 0x80000000);