Message ID | 20190507120011.18100-10-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 8041336ef74e19ca607c1601016333c986de8f9c |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:81:0:0:0:0 with SMTP id l1csp1250135ilm; Tue, 7 May 2019 05:01:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0V/g4BujUKgTJhpuBphmQ/A47Xau4CeGi/lHgblkOwYIHvcfIVqbFG1w/LdMQ4wGPljqY X-Received: by 2002:a5d:440e:: with SMTP id z14mr1602379wrq.70.1557230468387; Tue, 07 May 2019 05:01:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557230468; cv=none; d=google.com; s=arc-20160816; b=EVB6FMUjU2r9Mx4vlMpncRCn/MkBYXbnuj1oIUv4XceWh8Ir1DHzM9vq+XDNceByJS jUbqwyUA/0Em6q+7iWT1iPXbRxprMYONdaqi0fm7Ua/yrNJ91MuAFtcpApnFQDDqmK8C fOAc8c+UjzG8xcRCJwmOR8VmWXPSmpT3fjldHlrHOUbboVt29s5GdESjbUaD/O385L2Z 66Melk/aQ2I5WCDo+zKLbhbmk+3tVIChxpHhRy7AX29NExqyL8Cl6xUiti273x7j2BWs A74XaRhpttl9Sx9b2wMPSjkjM2Hs/fGdkziDD1xxBCo3/P3nb0837z5DE6fXdkNwyiyv m8xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=QJnsO/e2aUvBsiJ7AzOUR4tR/12UDD/kLgyFI8NTW1o=; b=GeOWzzwluoNpQJT32gu/ZnL62nRyFPqy2+YxwgLQsalgsLuFT7LVi9tnxTxL5pHGcC zUcwNqcr8kWWvwKG7fICL43OLb3yGvyMyKAnQTJfjZX25ENM9/3uxydcraMbNuU2GobX 5yrnrOsehS+6A0wPUhbXol1tnzqZxTt+7sZcitQPPCqos8hHEa4tZ88WDNOzhn4La7Ld gupgzmPwcl3LPy23GqxdDw8SmP/vleEzG/03QSOYM2F6nDfwDUKagUA/mG1zCDwoxP90 9dcyJSfl7DM9a9T/6T3kpgTe0NdjcltkY/0+G18XAKJFCO6TwxjkAl1OVfyHd7jsvv8t Z8lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BnAEaXTF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l16si869457wrm.433.2019.05.07.05.01.08 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 May 2019 05:01:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BnAEaXTF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:45591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1hNymR-0007dp-B0 for patch@linaro.org; Tue, 07 May 2019 08:01:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1hNylp-0007ZM-Pe for qemu-devel@nongnu.org; Tue, 07 May 2019 08:00:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1hNylo-0003oE-Ld for qemu-devel@nongnu.org; Tue, 07 May 2019 08:00:29 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42624) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1hNylo-0003lD-E7 for qemu-devel@nongnu.org; Tue, 07 May 2019 08:00:28 -0400 Received: by mail-wr1-x442.google.com with SMTP id l2so21966180wrb.9 for <qemu-devel@nongnu.org>; Tue, 07 May 2019 05:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QJnsO/e2aUvBsiJ7AzOUR4tR/12UDD/kLgyFI8NTW1o=; b=BnAEaXTFUWO2yvGLvWI9wI8DHMKde2icoVLoAdD48eNUKUXCWoOyK0Q2WZomDNrDHI ro7dJaY0h+ZP+bC5iTlTTuVpRgV/o7LYuvtrVRSxvioGc3KtNcjd50Nfw6Qugrkx5H40 MIeR22qsjo0PKlix+b9I1DRfo2DkfqGCGx/eKz5sDho4HR96eMhvwXreKcKZr658c143 4XqG4Ajty59yRLHWSzoECECmZbnLobrMz0zdjI9Im98aqWsESmUkiBmnU9WpWFvCtoA4 pHjFMZSd4B5iVkCiWDuAo8vwLlTm/vkD41f2S3WmXU0txVt2G/gnn12HSudlwNujKbES v0Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QJnsO/e2aUvBsiJ7AzOUR4tR/12UDD/kLgyFI8NTW1o=; b=gSyPFPL6MzSb9Uf5hgO1gYcMoso8MjRq/oftjuPMI2N8jg8BGg4lyGZGCOgiDl6s/m A+aI65LXgFGTZozqQwgM52eGHe3VDv1G5qVmo+NF7TPhG8WNuiFmuL1QjOgyl+p7UfiE 1fF0L87Rf9zvBcNXRE4tS2BiU8dIXbDAuyT4kE5s/DncJcRFQKUuPM8G4gcCkpn3nAjQ SwSigXeXOqlb6l4ZBKMhQubpJqwXkZTzlxuBJ5G9y+/FAE8f6efZsKdRVeMLvfEMoEh/ Mgq7/qhCZe3X17d2Iya99iUfEzocnF0VDo1OydLfWFSLEm0IDmdVHhGbK2VmBwfu6jkj pZMw== X-Gm-Message-State: APjAAAUIr3i3OlyrwP/7ZezNNGt2I75M/vr/i5t2ODZW6XS0vL4bTEpg pFPiBUwwLEy+GOBbbsM5AS2nI/LeDU4= X-Received: by 2002:a5d:674f:: with SMTP id l15mr21489298wrw.41.1557230427088; Tue, 07 May 2019 05:00:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id g3sm12348596wmf.9.2019.05.07.05.00.26 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 05:00:26 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 7 May 2019 13:00:05 +0100 Message-Id: <20190507120011.18100-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507120011.18100-1-peter.maydell@linaro.org> References: <20190507120011.18100-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PULL 09/15] util/cacheinfo: Use uint64_t on LLP64 model to satisfy Windows ARM64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/util/cacheinfo.c b/util/cacheinfo.c index 3cd080b83d1..eebe1ce9c5d 100644 --- a/util/cacheinfo.c +++ b/util/cacheinfo.c @@ -107,7 +107,7 @@ static void sys_cache_info(int *isize, int *dsize) static void arch_cache_info(int *isize, int *dsize) { if (*isize == 0 || *dsize == 0) { - unsigned long ctr; + uint64_t ctr; /* The real cache geometry is in CCSIDR_EL1/CLIDR_EL1/CSSELR_EL1, but (at least under Linux) these are marked protected by the