From nobody Sat Jun 13 18:10:51 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E6902D2385; Wed, 6 May 2026 06:16:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778048213; cv=none; b=GL0hrVcwu4eacRhLpQ0rWxB47DRahZTYj2ZFIFX5KW1dz0wMzR8fQKiHQU239yTbkneC0g7AdZq/HnKrK38oFbJ2JDYVaxbyTTFlr4YFKgRmSCOpldzUF3bTBSjpH30QF7kaJF+a/0mPfGGuLleDcr6znbOb9Tfg/A4O8gRGb+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778048213; c=relaxed/simple; bh=PDrQo7Mpo8RTcLkgvbcDqSEdXhEX9QDV+qsQwRO4DSM=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=HEdnRECovVUET056/tRRegJaXPHLEEpJ2upu+FSyoAiXrWiv8btqpxtV2kr2XnMFxtsjn/xJLmkGe7MXfjBhbq5yqZhzvtn45JCudUamyMvKWFM7mg08jPotLG2EqfD6GuiHSHJyBdmnUub7/S/r+Ha/PKfIlgF6HtMDSiqVEcg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=cnbYU0F7; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ekAxj1XT; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="cnbYU0F7"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ekAxj1XT" Date: Wed, 06 May 2026 06:16:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1778048210; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8hjFWMaJUjNkOp6ZsjVaQ1jfhdRL35RbKGjbtz4Tf8=; b=cnbYU0F7SWMFj5Fjxj1ody6CuzJqw8l+V8CX0d71H6Vhgl3ps5VXYEgsPIG0WHRVHHwUnd tL0DGPKVci2L2VjoZ6IJ82h5IbLIVMy1sWJT1hw9VcXmx+gI9ebvBSryZqjUIj8WtB27dm n1dGOgYbuVzrF8cibeji4/jfF0xRh5pjmAJoAfPM0bNleVPmXy5Wa9rIWCd0ifKpm/L88e YTKZxwdd3NznQ5elqFf+oEGJrDM/JOuquS1XcoT7SEm9ZpE3PpGBuArIRrVL14ZPeLzH9G My3EYC9zwDOgBSktJqSVyrNn1cjioftrDcvF6f6I20zcjkXnFR2ZsTx0rfy34Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1778048210; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8hjFWMaJUjNkOp6ZsjVaQ1jfhdRL35RbKGjbtz4Tf8=; b=ekAxj1XTPZQ4w4Lk6bwqc6s+qTsUf6fdjr6dTaW5+wE7NoTopuz37DYgW4Ag4HPU2sjfLg 1ArhQPYaOw0B5IAg== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cpu: Remove TSC-less CONFIG_M586 support Cc: Ingo Molnar , Arnd Bergmann , Dave Hansen , Linus Torvalds , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177804820916.424702.2445891946273706356.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/cpu branch of tip: Commit-ID: dbafa16ec2b6be40055db181c99f2529b20dd951 Gitweb: https://git.kernel.org/tip/dbafa16ec2b6be40055db181c99f2529b= 20dd951 Author: Ingo Molnar AuthorDate: Fri, 25 Apr 2025 10:42:01 +02:00 Committer: Ingo Molnar CommitterDate: Wed, 06 May 2026 08:02:10 +02:00 x86/cpu: Remove TSC-less CONFIG_M586 support Remove support for TSC-less Pentium variants. All TSC-capable Pentium variants, derivatives and clones should still work under the M586TSC or M586MMX options. Signed-off-by: Ingo Molnar Reviewed-by: Arnd Bergmann Acked-by: Dave Hansen Cc: Linus Torvalds Link: https://lore.kernel.org/r/20250425084216.3913608-5-mingo@kernel.org --- arch/x86/Kconfig.cpu | 10 +--------- arch/x86/Makefile_32.cpu | 1 - arch/x86/include/asm/vermagic.h | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 71f2644..9b91209 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -43,14 +43,6 @@ choice See each option's help text for additional details. If you don't know what to do, choose "Pentium-Pro". =20 -config M586 - bool "586/K5/5x86/6x86/6x86MX" - depends on X86_32 - help - Select this for an 586 or 686 series processor such as the AMD K5, - the Cyrix 5x86, 6x86 and 6x86MX. This choice does not - assume the RDTSC (Read Time Stamp Counter) instruction. - config M586TSC bool "Pentium-Classic" depends on X86_32 @@ -250,7 +242,7 @@ config X86_L1_CACHE_SHIFT default "7" if MPENTIUM4 default "6" if MK7 || MPENTIUMM || MATOM || MVIAC7 || X86_GENERIC || X86_= 64 default "4" if MGEODEGX1 - default "5" if MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII ||= MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX + default "5" if MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII ||= MPENTIUMII || M686 || M586MMX || M586TSC || MVIAC3_2 || MGEODE_LX =20 config X86_F00F_BUG def_bool y diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu index 707827f..ec9f34d 100644 --- a/arch/x86/Makefile_32.cpu +++ b/arch/x86/Makefile_32.cpu @@ -10,7 +10,6 @@ else align :=3D -falign-functions=3D0 -falign-jumps=3D0 -falign-loops=3D0 endif =20 -cflags-$(CONFIG_M586) +=3D -march=3Di586 cflags-$(CONFIG_M586TSC) +=3D -march=3Di586 cflags-$(CONFIG_M586MMX) +=3D -march=3Dpentium-mmx cflags-$(CONFIG_M686) +=3D -march=3Di686 diff --git a/arch/x86/include/asm/vermagic.h b/arch/x86/include/asm/vermagi= c.h index b3a8beb..e26061d 100644 --- a/arch/x86/include/asm/vermagic.h +++ b/arch/x86/include/asm/vermagic.h @@ -5,8 +5,6 @@ =20 #ifdef CONFIG_X86_64 /* X86_64 does not define MODULE_PROC_FAMILY */ -#elif defined CONFIG_M586 -#define MODULE_PROC_FAMILY "586 " #elif defined CONFIG_M586TSC #define MODULE_PROC_FAMILY "586TSC " #elif defined CONFIG_M586MMX