Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp764339ybj; Thu, 7 May 2020 07:10:00 -0700 (PDT) X-Google-Smtp-Source: APiQypIAMZx12fGYedvLktrzlT8Yyc1aThclBvrFrIWGtUf4ob5B1NEjPJG+XiKZUWtOjXz97H4l X-Received: by 2002:a05:6402:d0a:: with SMTP id eb10mr11685376edb.60.1588860600131; Thu, 07 May 2020 07:10:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588860600; cv=none; d=google.com; s=arc-20160816; b=GdJeBm507TX007RQXmCnwvghUieo34Mj4SGWsvq61zIFufI9gImTRD8ycVpURIQkq7 zxtRnC9b648Vu3GzmYeELneptRKvl/gYAlmf3dIwc5C6RC6HjRW4cqHy1wx6iY3W4jD3 r/PhH2Djz08ritpNGX6JnR3+SsTGs/LoQbvlpEM0NgRlI2wi9aK6dXXct6CJJNLkp9sQ hodJe9JtEXQc5ZfMRum7gL+Q+xRLCQEO8HCFeZHFw1FeCCKmQPleccw//qrYv1e1dN+F qJzu2H9ccxWaqNP6YIdg64X8NTz0w4a8jq8xqt7R0tJVpWJ/fgPbWRY/ItzGW0hcJY28 pvHA== 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=Q2Xq1eNG1v8xEzMGt9nCUcPxWBvO2BLxRblWMnkqm5E=; b=xhUSZvMpUOyWWvpa0uw+C73tdipkSWMPFfj74yWMoQHvOauMKoqbtvEo5Zo3kwqz4K kSLmadByVyRPDVs+AzwQpaNuPJNocIoYYnn5HVecHkjqn/sy7s2t+9CeBtC8EVvkrFFK hgruopjftClinlVGq93oynBJOQJJ25QOvlxTccDA8KujhawecOEn6fGMBGVJFy6EET+6 ZWqYg5IaUTaV59wyTbN1xLVsqITkbv9kPOaqP0F1kQjqvnkSYdGOdhGw9X5eOMdCNole tEHDzTpjCkpeckmClQ6wdPTjnDrdDO2jcblF6vLs+u35le3cA53Z6YUuMR+Eq0yulROM bfew== 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 ch12si3219470ejb.36.2020.05.07.07.09.36; Thu, 07 May 2020 07:10:00 -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 S1727795AbgEGOHb (ORCPT + 99 others); Thu, 7 May 2020 10:07:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727097AbgEGOH2 (ORCPT ); Thu, 7 May 2020 10:07:28 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7563EC05BD43; Thu, 7 May 2020 07:07:28 -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 1jWhBK-00026b-5k; Thu, 07 May 2020 16:07:22 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id C78C81C001A; Thu, 7 May 2020 16:07:21 +0200 (CEST) Date: Thu, 07 May 2020 14:07:21 -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: Remove _uv_hub_info_check() Cc: Christoph Hellwig , Thomas Gleixner , Russ Anderson , x86 , LKML In-Reply-To: <20200504171527.2845224-10-hch@lst.de> References: <20200504171527.2845224-10-hch@lst.de> MIME-Version: 1.0 Message-ID: <158886044178.8414.125576865550721705.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: fbe1d37866d249b6936cf526592957725a941f95 Gitweb: https://git.kernel.org/tip/fbe1d37866d249b6936cf526592957725a941f95 Author: Christoph Hellwig AuthorDate: Mon, 04 May 2020 19:15:25 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 07 May 2020 15:32:23 +02:00 x86/platform/uv: Remove _uv_hub_info_check() Neither this functions nor the helpers used to implement it are used anywhere in the kernel tree. 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-10-hch@lst.de --- arch/x86/include/asm/uv/uv_hub.h | 14 -------------- arch/x86/kernel/apic/x2apic_uv_x.c | 6 ------ 2 files changed, 20 deletions(-) diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index 8a25d95..9eabd7e 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h @@ -219,20 +219,6 @@ static inline struct uv_hub_info_s *uv_cpu_hub_info(int cpu) return (struct uv_hub_info_s *)uv_cpu_info_per(cpu)->p_uv_hub_info; } -#define UV_HUB_INFO_VERSION 0x7150 -extern int uv_hub_info_version(void); -static inline int uv_hub_info_check(int version) -{ - if (uv_hub_info_version() == version) - return 0; - - pr_crit("UV: uv_hub_info version(%x) mismatch, expecting(%x)\n", - uv_hub_info_version(), version); - - BUG(); /* Catastrophic - cannot continue on unknown UV system */ -} -#define _uv_hub_info_check() uv_hub_info_check(UV_HUB_INFO_VERSION) - /* * HUB revision ranges for each UV HUB architecture. * This is a software convention - NOT the hardware revision numbers in diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 3830538..8cf0e24 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -415,12 +415,6 @@ static __initdata struct uv_gam_range_s *_gr_table; #define SOCK_EMPTY ((unsigned short)~0) -extern int uv_hub_info_version(void) -{ - return UV_HUB_INFO_VERSION; -} -EXPORT_SYMBOL(uv_hub_info_version); - /* Default UV memory block size is 2GB */ static unsigned long mem_block_size __initdata = (2UL << 30);