From patchwork Fri Jun 30 17:01:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9820165 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 08E3B602B1 for ; Fri, 30 Jun 2017 17:18:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E335C28669 for ; Fri, 30 Jun 2017 17:18:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D809F286BE; Fri, 30 Jun 2017 17:18:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 83E5828669 for ; Fri, 30 Jun 2017 17:18:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQzWr-00054X-Dx; Fri, 30 Jun 2017 17:16:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQzWq-00053y-64 for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 17:16:24 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id C8/4E-01862-76786595; Fri, 30 Jun 2017 17:16:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpG5ae1i kweQrlhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bjW7dYC3p5K9Z++MzYwPiKq4uRk0NCwF9i 656b7CA2m4CyxM/OXjYQW0RAT6LpwHNGEJtZIE/i7OpFrF2MHBzCAoYSzxcrgYRZBFQl/j/qY QGxeQUsJLYvXsgCMVJeYlfbRVYQmxMofmnDNLC4kIC5xOKre5ggbAWJjunHmCB6BSVOznzCAr FKQuLgixfMExh5ZyFJzUKSWsDItIpRozi1qCy1SNfIWC+pKDM9oyQ3MTNH19DAWC83tbg4MT0 1JzGpWC85P3cTIzB06hkYGHcw9u31O8QoycGkJMq78lpopBBfUn5KZUZicUZ8UWlOavEhRhkO DiUJ3iVtYZFCgkWp6akVaZk5wCCGSUtw8CiJ8LKDpHmLCxJzizPTIVKnGHU5Xk34/41JiCUvP y9VSpw3BqRIAKQoozQPbgQsoi4xykoJ8zIyMDAI8RSkFuVmlqDKv2IU52BUEubdCzKFJzOvBG 7TK6AjmICOEJ4RAnJESSJCSqqBMYWloPBd1CSNpmPvPpj/txJ6tTRvuVZNxPrvHeK2OwVTrA5 GLlv34J+y1mm/++9LDko4NpkUfPOq6SpkWbR95RUD2XLjk16qSYH9383EX2pw3JugN/GJScS2 u8kxizgOH3jp3ZJe6HIqf7bt62S3Uv/0k4wd6aViy9sdPgUvnnnDce61nOwPSizFGYmGWsxFx YkA+BMD96MCAAA= X-Env-Sender: prvs=347159f46=wei.liu2@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1498842981!95849835!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48872 invoked from network); 30 Jun 2017 17:16:22 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 30 Jun 2017 17:16:22 -0000 X-IronPort-AV: E=Sophos;i="5.40,287,1496102400"; d="scan'208";a="430035728" From: Wei Liu To: Xen-devel Date: Fri, 30 Jun 2017 18:01:20 +0100 Message-ID: <20170630170126.4148-13-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170630170126.4148-1-wei.liu2@citrix.com> References: <20170630170126.4148-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH 12/18] x86/srat.c: use plain bool X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Wei Liu --- xen/arch/x86/srat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index d86783eddd..cd1283e58c 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -41,7 +41,7 @@ static struct node node_memblk_range[NR_NODE_MEMBLKS]; static nodeid_t memblk_nodeid[NR_NODE_MEMBLKS]; static __initdata DECLARE_BITMAP(memblk_hotplug, NR_NODE_MEMBLKS); -static inline bool_t node_found(unsigned idx, unsigned pxm) +static inline bool node_found(unsigned idx, unsigned pxm) { return ((pxm2node[idx].pxm == pxm) && (pxm2node[idx].node != NUMA_NO_NODE)); @@ -65,7 +65,7 @@ nodeid_t setup_node(unsigned pxm) { nodeid_t node; unsigned idx; - static bool_t warned; + static bool warned; static unsigned nodes_found; BUILD_BUG_ON(MAX_NUMNODES >= NUMA_NO_NODE); @@ -88,7 +88,7 @@ nodeid_t setup_node(unsigned pxm) if (!warned) { printk(KERN_WARNING "SRAT: Too many proximity domains (%#x)\n", pxm); - warned = 1; + warned = true; } return NUMA_NO_NODE; @@ -311,8 +311,8 @@ acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma) if (i < 0) /* everything fine */; else if (memblk_nodeid[i] == node) { - bool_t mismatch = !(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) != - !test_bit(i, memblk_hotplug); + bool mismatch = !(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) != + !test_bit(i, memblk_hotplug); printk("%sSRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with itself (%"PRIx64"-%"PRIx64")\n", mismatch ? KERN_ERR : KERN_WARNING, pxm, start, end,