From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A06FA26B94D; Tue, 8 Apr 2025 12:33:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115602; cv=none; b=ANRQYEk+fXigd499VeWMy/aogfN5Buj17Iz0k+naQtmBO+Xy46YfTJ0Qz6EOrtPXU+sn9/69T+2f94hKbT/6a91froKKn+SRmv1SaAiCbssJiOB693drSMo2hTalUqjD0BjfGM+TkuCu8GyoKGdq0sKo2P7V95vFhROVdoTgyG0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115602; c=relaxed/simple; bh=6+r0v09x5qCaxhf4dS7uavIVvTBlCutBqx/wPmb4DYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qKX7J+71+E2v9x+YxBUujFxO10fYijyLawePsflVE8uzUcWuOLNC0cUm0ezNUunm4sfZBSKtN6lZg8SZz+N+jRmJ4g8y2w6LDaMBf9e0Y7twg39ygRvh/ZOd2ORaoQ37UVYTTcsF/RCLcHjGE8b7Y/YkqULwYX+jVmE2k1F0T04= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2Sa2oCuZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2Sa2oCuZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FFE2C4CEE5; Tue, 8 Apr 2025 12:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744115602; bh=6+r0v09x5qCaxhf4dS7uavIVvTBlCutBqx/wPmb4DYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2Sa2oCuZkyF3AEWNHrkHR0sB9eRtLMZupe3i9nYB7DePNmAiALQrK0Ox1h6pPxnrw ZiwncUTb+Dos4YL6HtsAapyVUhIPFBrxlCHTC9nfLWCKfDM3v0iAdebu4NKMO7EcKh WHSNYqofBWB5J1PJkLLVBToK3Mv8SeVUxC6d/dbI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Ingo Molnar , Linus Torvalds , Sasha Levin Subject: [PATCH 6.1 008/204] x86/platform: Only allow CONFIG_EISA for 32-bit Date: Tue, 8 Apr 2025 12:48:58 +0200 Message-ID: <20250408104820.540809154@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.266892317@linuxfoundation.org> References: <20250408104820.266892317@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit 976ba8da2f3c2f1e997f4f620da83ae65c0e3728 ] The CONFIG_EISA menu was cleaned up in 2018, but this inadvertently brought the option back on 64-bit machines: ISA remains guarded by a CONFIG_X86_32 check, but EISA no longer depends on ISA. The last Intel machines ith EISA support used a 82375EB PCI/EISA bridge from 1993 that could be paired with the 440FX chipset on early Pentium-II CPUs, long before the first x86-64 products. Fixes: 6630a8e50105 ("eisa: consolidate EISA Kconfig entry in drivers/eisa") Signed-off-by: Arnd Bergmann Signed-off-by: Ingo Molnar Cc: Linus Torvalds Link: https://lore.kernel.org/r/20250226213714.4040853-11-arnd@kernel.org Signed-off-by: Sasha Levin --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ca8dd7e5585f0..48ab6e8f2d1d4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -208,7 +208,7 @@ config X86 select HAVE_SAMPLE_FTRACE_DIRECT_MULTI if X86_64 select HAVE_EBPF_JIT select HAVE_EFFICIENT_UNALIGNED_ACCESS - select HAVE_EISA + select HAVE_EISA if X86_32 select HAVE_EXIT_THREAD select HAVE_FAST_GUP select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE -- 2.39.5