From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79123C433F5 for ; Fri, 24 Sep 2021 12:48:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5507361353 for ; Fri, 24 Sep 2021 12:48:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344259AbhIXMuD (ORCPT ); Fri, 24 Sep 2021 08:50:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:43882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344260AbhIXMsq (ORCPT ); Fri, 24 Sep 2021 08:48:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B1E061242; Fri, 24 Sep 2021 12:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632487633; bh=30IJfO6+UIZhILYz2IQY3jWueeAoFeeQXNBJwfTQe5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=muXf2lhLWJ+rT5mfun13/Lt1R+mvnTkHkrvcuK2ees8ffKcY0UEmotsrbiv9hPQC4 KhpFeaq5DWligHwMaMbgPpk5wignVlWlMqxjG1EQw8zS1dbjjisyVIRHurvMwPQrMQ 8sctwQ+Apwr9mUZbhijk4PsSC2DlgBL80jlVCjRs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Johannes Berg , Dave Jiang , Vinod Koul , Sasha Levin Subject: [PATCH 4.14 16/27] dmaengine: ioat: depends on !UML Date: Fri, 24 Sep 2021 14:44:10 +0200 Message-Id: <20210924124329.715858395@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924124329.173674820@linuxfoundation.org> References: <20210924124329.173674820@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johannes Berg [ Upstream commit bbac7a92a46f0876e588722ebe552ddfe6fd790f ] Now that UML has PCI support, this driver must depend also on !UML since it pokes at X86_64 architecture internals that don't exist on ARCH=um. Reported-by: Geert Uytterhoeven Signed-off-by: Johannes Berg Acked-by: Dave Jiang Link: https://lore.kernel.org/r/20210809112409.a3a0974874d2.I2ffe3d11ed37f735da2f39884a74c953b258b995@changeid Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index ff69feefc1c6..5ea37d133f24 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -262,7 +262,7 @@ config INTEL_IDMA64 config INTEL_IOATDMA tristate "Intel I/OAT DMA support" - depends on PCI && X86_64 + depends on PCI && X86_64 && !UML select DMA_ENGINE select DMA_ENGINE_RAID select DCA -- 2.33.0