From 7d328c5de43a9e29dc6cd1ba3e578c1a32ebc486 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 25 Apr 2025 10:42:00 +0200 Subject: [PATCH] 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 Reviewed-by: Arnd Bergmann Acked-by: Dave Hansen Cc: Linus Torvalds 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 8868aa19d88aa..71f264443d78b 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 65a58a390fc31..0000000000000 --- a/arch/x86/kernel/cpu/umc.c +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#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); - -- 2.47.3