From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 109843 invoked by alias); 7 Oct 2019 19:55:20 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 109828 invoked by uid 9996); 7 Oct 2019 19:55:20 -0000 Date: Mon, 07 Oct 2019 19:55:00 -0000 Message-ID: <20191007195520.109827.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] fhandler_proc.cc(format_proc_cpuinfo): fix AMD physical cores count X-Act-Checkin: newlib-cygwin X-Git-Author: Brian Inglis X-Git-Refname: refs/heads/master X-Git-Oldrev: 74aa6e3cdb167bdbfa02d5781e9efb154a15bcdb X-Git-Newrev: 7a0496f78f60d43cf9545a794cbf8c00d7bb8e02 X-SW-Source: 2019-q4/txt/msg00003.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7a0496f78f60d43cf9545a794cbf8c00d7bb8e02 commit 7a0496f78f60d43cf9545a794cbf8c00d7bb8e02 Author: Brian Inglis Date: Mon Oct 7 10:23:00 2019 -0600 fhandler_proc.cc(format_proc_cpuinfo): fix AMD physical cores count Fix AMD physical cores count documented as core_info low byte + 1. Diff: --- winsup/cygwin/fhandler_proc.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 78518ba..c94cde9 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -885,11 +885,10 @@ format_proc_cpuinfo (void *, char *&destbuf) cpuid (&unused, &unused, &core_info, &unused, 0x80000008); cpuid (&unused, &cus, &unused, &unused, 0x8000001e); - siblings = (core_info & 0xff) + 1; + siblings = cpu_cores = (core_info & 0xff) + 1; logical_bits = (core_info >> 12) & 0xf; cus = ((cus >> 8) & 0x3) + 1; ht_bits = mask_bits (cus); - cpu_cores = siblings >> ht_bits; } else if (maxe >= 0x80000008) {