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 0CF5929A9; Fri, 15 Nov 2024 06:46:57 +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=1731653217; cv=none; b=qNaWuAffO1K2zwVtkDjKr0DBVmN4FvBSKvbnIK0AW5m+WN6dmgc4OvBubfTDpB3qqLxq/AFehNTo6/F1tl3uWL92yvNE/GL04nLXBHwEeLCi7SHxZzSPRzRqSBAHTnqU9ItUEBCNZTExGsjvHz6dQcZmi4hbC8RYMDyfUIK96PI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653217; c=relaxed/simple; bh=gQo0s5heO96qdNESvYtDBp32y031vl6W87i+PXHWT+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ctndtfGN4Cq+TJ+Sk4H4WzgMpqPngUyIVHi9aqaACNHFvYzX7qdtuMilrbu1HbRDEx9Na7G71fXWvTFI9PaP7YM1hR+XWa0jt9FhiI9vl0fksjEwzxnyPgZO9W9zGzRgIpAxReHVoxi7lpH/PLAbyZz7tdzZmfpbG7YIyYLuCmU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=plMS51zp; 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="plMS51zp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70335C4CECF; Fri, 15 Nov 2024 06:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731653216; bh=gQo0s5heO96qdNESvYtDBp32y031vl6W87i+PXHWT+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=plMS51zptwa8/0ohWZQnqMLAX7sY5Lyg7BjPyV4OVuuLyD2W4/3yaLkfRMvnFMCbL XoElxBgZGzR9Nhj1iW8ub4oge/1wWU5/Vw4OjvuLl/rC9d1ZmPT4fO2RV+4gDZgh0Z vXYc0Pld8FHvXHwww4ih6i/8+8ZrQm7JVLBjPdbE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yann Sionneau , Julian Vetter , Takashi Iwai , Sasha Levin Subject: [PATCH 6.11 20/63] sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML Date: Fri, 15 Nov 2024 07:37:43 +0100 Message-ID: <20241115063726.649785587@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241115063725.892410236@linuxfoundation.org> References: <20241115063725.892410236@linuxfoundation.org> User-Agent: quilt/0.67 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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Julian Vetter [ Upstream commit ad6639f143a0b42d7fb110ad14f5949f7c218890 ] When building for the UM arch and neither INDIRECT_IOMEM=y, nor HAS_IOMEM=y is selected, it will fall back to the implementations from asm-generic/io.h for IO memcpy. But these fall-back functions just do a memcpy. So, instead of depending on UML, add dependency on 'HAS_IOMEM || INDIRECT_IOMEM'. Reviewed-by: Yann Sionneau Signed-off-by: Julian Vetter Link: https://patch.msgid.link/20241010124601.700528-1-jvetter@kalrayinc.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/Kconfig b/sound/Kconfig index 4c036a9a420ab..8b40205394fe0 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig SOUND tristate "Sound card support" - depends on HAS_IOMEM || UML + depends on HAS_IOMEM || INDIRECT_IOMEM help If you have a sound card in your computer, i.e. if it can say more than an occasional beep, say Y. -- 2.43.0