From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33F64C43219 for ; Tue, 30 Apr 2019 20:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F164B2081C for ; Tue, 30 Apr 2019 20:57:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556657842; bh=ZnQmzZd6wvP/IK0HwOy+zcnUZULAlffdR5ZJQrx9ugQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To:List-ID: From; b=T34IB/AXomqwYefG6CYo4HqgmaZjURJ45UC9HDZGesE14GehX/Ml/K6o0qli4N5Ra fTrVbDNW0am1t8sXmTgpDk7x8VKtPXdMRieGwGtiMvhAyYxYqBa7qTpNZ+llHb8zs/ 9zYhtYTog/O0N+Ho/Gd9XgRG98Ol9WQD4ZuUGOvY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727590AbfD3U5V (ORCPT ); Tue, 30 Apr 2019 16:57:21 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:42327 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727054AbfD3U4T (ORCPT ); Tue, 30 Apr 2019 16:56:19 -0400 Received: by mail-io1-f66.google.com with SMTP id m188so13427876ioa.9 for ; Tue, 30 Apr 2019 13:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :reply-to:organization; bh=HbIvXXxkoOYvDJka1De1DE8EvRWM+I3icfIF/qPG/Mo=; b=npmUHW0Er03hsah4vxKt/Rsc1QsknX9ri0ksYinJ9g/tzmhoquukur+SX/2oshvVa8 /mFc072TVT2d5dSTRyp61oXVEBginSqtFPaNNOFd0YMNYZRQl5y1vXaN+RP+OPOz5fPx 5MtIdUvP5dP21zOrtu/wUzCPjDuL2XVZlakDVKFiNIGo9WXY5T+SP3+ucjpjJDeTh0R0 h4MuAQcXBNMLv1MU742iruUUWfmDQqm9agy3yYLk7xxNrOPmlXYhmi2KzHcMrTe7Jbia X1UuNJkG2MxNMgwX/O6M+hYcnt6rthuFaLDHRQeUKQhnypA8s8KzavNea1oJ7I/L7uuA 6ZUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:reply-to:organization; bh=HbIvXXxkoOYvDJka1De1DE8EvRWM+I3icfIF/qPG/Mo=; b=DZU9+ks/hZ+nZ9EOcs1xCyoaPYxV5l0CZtRVa0J0ctvH0gpkNEfhJhqrjdyyKndUUh zWNdW2egNms/XKyANHVM4akOa57Ns6rKqyOv49BlwD+r+R3s/b2rY8AroJ88hW64+WdX fnFaSRD6WmxrhNrG/j1BwU5ReIcz4fS+maBU+LX/BySxCS27IFzieDPZY1awsSWouIEF 5NLFNdFdOJfwtgjbDrbOLjrTGE5C5kwyU44GYt2goooaVJ2DHB7wGv0Y2A/w4Oh7Uo+m itMnGwW7XyTB6rxvUFfpTliZ0Kt44+mSlzeeI7cxNTbS8SfGQkQOK7WEr4kRWXXmW2Yc pl7Q== X-Gm-Message-State: APjAAAVDyz7fQ7wq9e24/AA77YuHq3SyhTAiGyVO3dj6nGrWEeLK69Fy PTTSiMbL2aRcj32Qu/mQ1w5HUdim X-Google-Smtp-Source: APXvYqy6lynZTAveazXX1fd2mBJPceLVJOsg+RbD9KIIi6zHxoFluYnVZkR9PEv7gqwtHxB18lWT/Q== X-Received: by 2002:a5e:a712:: with SMTP id b18mr18548078iod.119.1556657778742; Tue, 30 Apr 2019 13:56:18 -0700 (PDT) Received: from nuc8.lan (h69-131-112-51.cntcnh.dsl.dynamic.tds.net. [69.131.112.51]) by smtp.gmail.com with ESMTPSA id s7sm9799349ioo.17.2019.04.30.13.56.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Apr 2019 13:56:18 -0700 (PDT) From: Len Brown To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 03/14] x86 smpboot: Rename match_die() to match_pkg() Date: Tue, 30 Apr 2019 16:55:48 -0400 Message-Id: <5704b04c9992ac75ee4f004c21648ae7e9df09c2.1553624867.git.len.brown@intel.com> X-Mailer: git-send-email 2.18.0-rc0 In-Reply-To: <75386dff62ee869eb7357dff1e60dfd9b3e68023.1553624867.git.len.brown@intel.com> References: <75386dff62ee869eb7357dff1e60dfd9b3e68023.1553624867.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Len Brown Syntax only, no functional or semantic change. This routine matches packages, not die, so name it thus. Signed-off-by: Len Brown --- arch/x86/kernel/smpboot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index ccd1f2a8e557..19a963890bbe 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -459,7 +459,7 @@ static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) * multicore group inside a NUMA node. If this happens, we will * discard the MC level of the topology later. */ -static bool match_die(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) +static bool match_pkg(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) { if (c->phys_proc_id == o->phys_proc_id) return true; @@ -550,7 +550,7 @@ void set_cpu_sibling_map(int cpu) for_each_cpu(i, cpu_sibling_setup_mask) { o = &cpu_data(i); - if ((i == cpu) || (has_mp && match_die(c, o))) { + if ((i == cpu) || (has_mp && match_pkg(c, o))) { link_mask(topology_core_cpumask, cpu, i); /* @@ -574,7 +574,7 @@ void set_cpu_sibling_map(int cpu) } else if (i != cpu && !c->booted_cores) c->booted_cores = cpu_data(i).booted_cores; } - if (match_die(c, o) && !topology_same_node(c, o)) + if (match_pkg(c, o) && !topology_same_node(c, o)) x86_has_numa_in_package = true; } -- 2.18.0-rc0