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 9D04926988E; Tue, 8 Apr 2025 12:09:51 +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=1744114191; cv=none; b=AhwfeD/7WrqydCl3bmx3l1G320cIFAasr9dFKBy6Rs2phVfRL2zI67sJ02s+bnlOl16A6uoSNBBVkvIqAannumb05zPBjP6oGLHWHU+QwBDXTHajop/a7L+hng2p6A5rc5WD9b5uTa639izhn0ERpnrvwb1kFn1wcta8enXS5+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744114191; c=relaxed/simple; bh=/schn1HkJboKodfgG/rcGmXDjWdOXbLdnKFq26fSJgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nT6Hh92Uy6PE03hJMmdEMZmx9YwJO19bCQr6yP0yIlxJeqXkJx6BruzSoJvEw+hMVy/jIUO42sCwc30s2gc/M8/yPHFuHQpv/cqoVtVMbIGWWTwcq15KRqqmQ/rmeGx7CkKHjNBZ4RyyUAsQFRkhdkF9gk4Fw4KiE5BZQb1aktE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DFhQYhpm; 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="DFhQYhpm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B44EC4CEE5; Tue, 8 Apr 2025 12:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744114191; bh=/schn1HkJboKodfgG/rcGmXDjWdOXbLdnKFq26fSJgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DFhQYhpm2PVcvMYTxCDNa7BAfxLCbj5anVhj/e2WlDrHo+4WH9KHbdLiGq6M4MyFw AVC+SknTLt4H1+lifIgu/fihMdoldS9K4niba+z50XMs8n1EhG75Cp4e3hBrr+EHCH wukw44zf8K4a1w9Xaxag7BnYK10v2M5i4gmPYnMU= 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.13 016/499] x86/platform: Only allow CONFIG_EISA for 32-bit Date: Tue, 8 Apr 2025 12:43:48 +0200 Message-ID: <20250408104851.658644045@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104851.256868745@linuxfoundation.org> References: <20250408104851.256868745@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.13-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 757333fe82c76..6fe28f584a5ac 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -229,7 +229,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_GUP_FAST select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE -- 2.39.5