linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Christoph Hellwig" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>,
	Thomas Gleixner <tglx@linutronix.de>, Russ Anderson <rja@hpe.com>,
	x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/platform] x86/platform/uv: Remove _uv_hub_info_check()
Date: Thu, 07 May 2020 14:07:21 -0000	[thread overview]
Message-ID: <158886044178.8414.125576865550721705.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200504171527.2845224-10-hch@lst.de>

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 <hch@lst.de>
AuthorDate:    Mon, 04 May 2020 19:15:25 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
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 <hch@lst.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Not-acked-by:  Dimitri Sivanich <sivanich@hpe.com>
Cc: Russ Anderson <rja@hpe.com>
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);
 

  reply	other threads:[~2020-05-07 14:07 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-04 17:15 x86/uv cleanups Christoph Hellwig
2020-05-04 17:15 ` [PATCH 01/11] x86/uv: Mark uv_bios_call and uv_bios_call_irqsave static Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: Mark uv_bios_call() and uv_bios_call_irqsave() static tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 02/11] x86/uv: Remove the uv_partition_coherence_id macro Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: Remove the uv_partition_coherence_id() macro tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 03/11] x86/uv: Unexport sn_coherency_id Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: " tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 04/11] x86/uv: Unexport symbols only used by x2apic_uv_x.c Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: " tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 05/11] x86/uv: Remove the UV*_HUB_IS_SUPPORTED macros Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: " tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 06/11] x86/uv: Mark is_uv_hubless static Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: Mark is_uv_hubless() static tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 07/11] x86/uv: Mark uv_min_hub_revision_id static Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: " tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 08/11] x86/uv: Simplify uv_send_IPI_one Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: Simplify uv_send_IPI_one() tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 09/11] x86/uv: Remove _uv_hub_info_check Christoph Hellwig
2020-05-07 14:07   ` tip-bot2 for Christoph Hellwig [this message]
2020-05-04 17:15 ` [PATCH 10/11] x86/uv: Unexport uv_apicid_hibits Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: " tip-bot2 for Christoph Hellwig
2020-05-04 17:15 ` [PATCH 11/11] x86/uv: Remove the unused _uv_cpu_blade_processor_id macro Christoph Hellwig
2020-05-07 14:07   ` [tip: x86/platform] x86/platform/uv: Remove the unused _uv_cpu_blade_processor_id() macro tip-bot2 for Christoph Hellwig
2020-05-05 15:39 ` x86/uv cleanups Dimitri Sivanich
2020-05-05 16:36   ` Andy Lutomirski
2020-05-05 23:14   ` Thomas Gleixner
2020-05-06 21:36     ` Russ Anderson
2020-05-07  4:51       ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=158886044178.8414.125576865550721705.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=rja@hpe.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).