Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp764779ybj; Thu, 7 May 2020 07:10:31 -0700 (PDT) X-Google-Smtp-Source: APiQypLIsvM1j3pG8wBRGtIPjiKyLJzib6BCuIKp588n+Lhu4RXxkMm7Z/orTvvWh0J6wA/LCOr1 X-Received: by 2002:a05:6402:1bc8:: with SMTP id ch8mr11782911edb.53.1588860631730; Thu, 07 May 2020 07:10:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588860631; cv=none; d=google.com; s=arc-20160816; b=NgDEBltbqS245XFNTN5PUsPbBivdYT7bvYY6cOBPkJBfv0v/Bu3lm96nVM2RvbsC6D puKqHqnKEKimZTzAYU9g95lIFEo0qd8nj6GYkqtqWJdZz0VjlwW5GlCl0ctfXpnueDaf rgZ+XBDDEJskR0FTyOvijpPLV5L1SWB6JWcZZhRxylxSdbSjDWwPB2OGSNQ02VMzpd22 r5tbDez/Yux0OWKdzXLy5fcHtSmm/U1+gG1nViYz5H0hZA6Br4rWqkeRDy+yL10W/M+z tt2Jyz6mHEbjoxLo9Z9/3eWGnuqPAQMTcRE9JFLfB8sSfFsgUhqlwmNOWcK2hl/OGuah ZbhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=zwHfYhvrFybB1gUxUSkYFTvLM0RtgBJgWQGiHsYP630=; b=eWAABHYgD7B+kMqojSNf3uMqQ0xrR5mAtQYUq9AS8wsWprl49Ceu7qhH3tVBgcGUvZ gbj12p40fdCQHcgTjpkRChoAmSxt9d61fHQK0B3Q6iUW6lOjdxhokrZ8//P9WbNycb6t t87tKIPzG4VFkY23jzsVZANDd6ABxf8Q/wTfeVDGieDzNJVu4SuYwP4T8wiUUNwr2k8p FHmxoszpfXkNsp8SE8LqHmqVxsWda9TM9G/SbHWFpC23Zt9kHTAAuv4xRxhGEPX3V70W jaFCoo6P+ptAv0PyS1zMHWJNwZXWIMORyHxFSrVE7jju4jK+iF6w9e7TX2OKobbhYL9A s0BQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn17si4400500ejc.311.2020.05.07.07.10.07; Thu, 07 May 2020 07:10:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727833AbgEGOH4 (ORCPT + 99 others); Thu, 7 May 2020 10:07:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726891AbgEGOH1 (ORCPT ); Thu, 7 May 2020 10:07:27 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44220C05BD0A; Thu, 7 May 2020 07:07:27 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jWhBL-00027e-3J; Thu, 07 May 2020 16:07:23 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id BE6381C03AB; Thu, 7 May 2020 16:07:22 +0200 (CEST) Date: Thu, 07 May 2020 14:07:22 -0000 From: "tip-bot2 for Christoph Hellwig" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/platform/uv: Mark is_uv_hubless() static Cc: Christoph Hellwig , Thomas Gleixner , Russ Anderson , x86 , LKML In-Reply-To: <20200504171527.2845224-7-hch@lst.de> References: <20200504171527.2845224-7-hch@lst.de> MIME-Version: 1.0 Message-ID: <158886044274.8414.7034570181169059963.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/platform branch of tip: Commit-ID: e4dd8b8351264fb5bef30c0a77e4d171e0603d63 Gitweb: https://git.kernel.org/tip/e4dd8b8351264fb5bef30c0a77e4d171e0603d63 Author: Christoph Hellwig AuthorDate: Mon, 04 May 2020 19:15:22 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 07 May 2020 15:32:21 +02:00 x86/platform/uv: Mark is_uv_hubless() static is_uv_hubless() is only used in x2apic_uv_x.c. Signed-off-by: Christoph Hellwig Signed-off-by: Thomas Gleixner Not-acked-by: Dimitri Sivanich Cc: Russ Anderson Link: https://lkml.kernel.org/r/20200504171527.2845224-7-hch@lst.de --- arch/x86/include/asm/uv/uv.h | 2 -- arch/x86/kernel/apic/x2apic_uv_x.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h index 45ea95c..ae587ce 100644 --- a/arch/x86/include/asm/uv/uv.h +++ b/arch/x86/include/asm/uv/uv.h @@ -31,7 +31,6 @@ static inline bool is_early_uv_system(void) } extern int is_uv_system(void); extern int is_uv_hubbed(int uvtype); -extern int is_uv_hubless(int uvtype); extern void uv_cpu_init(void); extern void uv_nmi_init(void); extern void uv_system_init(void); @@ -44,7 +43,6 @@ static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; } static inline bool is_early_uv_system(void) { return 0; } static inline int is_uv_system(void) { return 0; } static inline int is_uv_hubbed(int uv) { return 0; } -static inline int is_uv_hubless(int uv) { return 0; } static inline void uv_cpu_init(void) { } static inline void uv_system_init(void) { } static inline const struct cpumask * diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index ad53b2a..cb07a98 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -385,11 +385,10 @@ int is_uv_hubbed(int uvtype) } EXPORT_SYMBOL_GPL(is_uv_hubbed); -int is_uv_hubless(int uvtype) +static int is_uv_hubless(int uvtype) { return (uv_hubless_system & uvtype); } -EXPORT_SYMBOL_GPL(is_uv_hubless); void **__uv_hub_info_list; EXPORT_SYMBOL_GPL(__uv_hub_info_list);