The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 7d328c5de43a9e29dc6cd1ba3e578c1a32ebc486
Gitweb: https://git.kernel.org/tip/7d328c5de43a9e29dc6cd1ba3e578c1a32ebc486
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Fri, 25 Apr 2025 10:42:00 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 06 May 2026 08:01:45 +02:00
x86/cpu: Remove CPU_SUP_UMC_32 support
These are 486 based CPUs, which build option (M486) is now gone
upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250425084216.3913608-4-mingo@kernel.org
---
arch/x86/Kconfig.cpu | 14 --------------
arch/x86/kernel/cpu/umc.c | 26 --------------------------
2 files changed, 40 deletions(-)
delete mode 100644 arch/x86/kernel/cpu/umc.c
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 8868aa1..71f2644 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -399,20 +399,6 @@ config CPU_SUP_TRANSMETA_32
If unsure, say N.
-config CPU_SUP_UMC_32
- default y
- bool "Support UMC processors" if PROCESSOR_SELECT
- depends on M486SX || M486 || (EXPERT && !64BIT)
- help
- This enables detection, tunings and quirks for UMC processors
-
- You need this enabled if you want your kernel to run on a
- UMC CPU. Disabling this option on other types of CPUs
- makes the kernel a tiny bit smaller. Disabling it on a UMC
- CPU might render the kernel unbootable.
-
- If unsure, say N.
-
config CPU_SUP_ZHAOXIN
default y
bool "Support Zhaoxin processors" if PROCESSOR_SELECT
diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
deleted file mode 100644
index 65a58a3..0000000
--- a/arch/x86/kernel/cpu/umc.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/kernel.h>
-#include <asm/processor.h>
-#include "cpu.h"
-
-/*
- * UMC chips appear to be only either 386 or 486,
- * so no special init takes place.
- */
-
-static const struct cpu_dev umc_cpu_dev = {
- .c_vendor = "UMC",
- .c_ident = { "UMC UMC UMC" },
- .legacy_models = {
- { .family = 4, .model_names =
- {
- [1] = "U5D",
- [2] = "U5S",
- }
- },
- },
- .c_x86_vendor = X86_VENDOR_UMC,
-};
-
-cpu_dev_register(umc_cpu_dev);
-