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 9B58D26981A; Tue, 8 Apr 2025 10:59:21 +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=1744109961; cv=none; b=nBSSL+nF7z4y4I+Os6lfOQ42hjOcial4GcrKFAC/XRpYAe2lATnsAc8FBzWmJiFq662awxCcXgJINhvjW2V8+rNz7jVvN238KfYVctNkO+0fSysWBIoobL6aHZTSdAppbI2e4P06aU4n6tFeFgr5lyd1WJxD4Dqbpqnyfo+UImM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744109961; c=relaxed/simple; bh=91yi3Hs/QNp2zVCVcrZrd26EwtUOpxJ9M/l27I2bwYg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S4jPn9LH0f5TWekTXcWV7kHrczzDDyTIYld3O1x8SWrfDAq8zuxkJjAgzAdV07qLDHzX/So6IGqnEqyW+HNWlcK5znwaqjN4hZdCtwzvmKR4K+nUFUTgKidY0L3fIte4wqQqwsqfqTw9I7LHYs6OSg5yw1VqqJNpPDQudHXa6cw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CSpybHsH; 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="CSpybHsH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C94EC4CEE5; Tue, 8 Apr 2025 10:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744109961; bh=91yi3Hs/QNp2zVCVcrZrd26EwtUOpxJ9M/l27I2bwYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CSpybHsHz1QjdjsVRgQJ2FpHlgWMdED/Vda0GjETOXxngV8bo6h/yNFBPZKE8gPXg rBjrwlIObOOfLXfsdvR4/AFwBwddsGARABjoZ5fxkuy0oZv5taEgy/a1CHiMOVQI+w mW3lG4ejrcE4uSV+uFxJYQPI5O2B+Z7tv3rnrqIg= 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 5.10 116/227] x86/platform: Only allow CONFIG_EISA for 32-bit Date: Tue, 8 Apr 2025 12:48:14 +0200 Message-ID: <20250408104823.821535575@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.353768086@linuxfoundation.org> References: <20250408104820.353768086@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-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 00ae2e2adcadb..93a1f9937a9bb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -174,7 +174,7 @@ config X86 select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS 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