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 the UV*_HUB_IS_SUPPORTED macros
Date: Thu, 07 May 2020 14:07:23 -0000 [thread overview]
Message-ID: <158886044307.8414.15217547118518717450.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200504171527.2845224-6-hch@lst.de>
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: cc1991058705a9cc4fe51ab6c2116df17922ef82
Gitweb: https://git.kernel.org/tip/cc1991058705a9cc4fe51ab6c2116df17922ef82
Author: Christoph Hellwig <hch@lst.de>
AuthorDate: Mon, 04 May 2020 19:15:21 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 07 May 2020 15:32:21 +02:00
x86/platform/uv: Remove the UV*_HUB_IS_SUPPORTED macros
All of the macros are always defined to one. Remove them and the dead
code keyed off them.
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-6-hch@lst.de
---
arch/x86/include/asm/uv/uv_hub.h | 19 -------------------
arch/x86/include/asm/uv/uv_mmrs.h | 7 -------
2 files changed, 26 deletions(-)
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 950cd13..a998e65 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -244,51 +244,32 @@ static inline int uv_hub_info_check(int version)
#define UV4_HUB_REVISION_BASE 7
#define UV4A_HUB_REVISION_BASE 8 /* UV4 (fixed) rev 2 */
-/* WARNING: UVx_HUB_IS_SUPPORTED defines are deprecated and will be removed */
static inline int is_uv1_hub(void)
{
-#ifdef UV1_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(1));
-#else
- return 0;
-#endif
}
static inline int is_uv2_hub(void)
{
-#ifdef UV2_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(2));
-#else
- return 0;
-#endif
}
static inline int is_uv3_hub(void)
{
-#ifdef UV3_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(3));
-#else
- return 0;
-#endif
}
/* First test "is UV4A", then "is UV4" */
static inline int is_uv4a_hub(void)
{
-#ifdef UV4A_HUB_IS_SUPPORTED
if (is_uv_hubbed(uv(4)))
return (uv_hub_info->hub_revision == UV4A_HUB_REVISION_BASE);
-#endif
return 0;
}
static inline int is_uv4_hub(void)
{
-#ifdef UV4_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(4));
-#else
- return 0;
-#endif
}
static inline int is_uvx_hub(void)
diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h
index 62c79e2..9ee5ed6 100644
--- a/arch/x86/include/asm/uv/uv_mmrs.h
+++ b/arch/x86/include/asm/uv/uv_mmrs.h
@@ -99,13 +99,6 @@
#define UV3_HUB_PART_NUMBER_X 0x4321
#define UV4_HUB_PART_NUMBER 0x99a1
-/* Compat: Indicate which UV Hubs are supported. */
-#define UV1_HUB_IS_SUPPORTED 1
-#define UV2_HUB_IS_SUPPORTED 1
-#define UV3_HUB_IS_SUPPORTED 1
-#define UV4_HUB_IS_SUPPORTED 1
-#define UV4A_HUB_IS_SUPPORTED 1
-
/* Error function to catch undefined references */
extern unsigned long uv_undefined(char *str);
next prev parent reply other threads:[~2020-05-07 14:08 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-bot2 for Christoph Hellwig [this message]
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: x86/platform] x86/platform/uv: Remove _uv_hub_info_check() tip-bot2 for Christoph Hellwig
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=158886044307.8414.15217547118518717450.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
all inboxes | Powered by JetHome®