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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 45A26C433F5 for ; Mon, 13 Sep 2021 22:39:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E8CC61108 for ; Mon, 13 Sep 2021 22:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245511AbhIMWk6 (ORCPT ); Mon, 13 Sep 2021 18:40:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:51756 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244828AbhIMWiz (ORCPT ); Mon, 13 Sep 2021 18:38:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F3C5561245; Mon, 13 Sep 2021 22:35:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572537; bh=qf90acWJcGm4r4Sgkwn7/ODgTFh1WWf/J4lTgbaoQik=; h=From:To:Cc:Subject:Date:From; b=TFHcqOUh2I+ys4f4jxHM1ruwWQFc4OTWt92VjnaMqhmp0rezcH7wPA5Q+y68uJGzq TMCpead5nPsuDRZLAXJ0gMoNAmjMPuTbfCWv1U5KBGDm9yztXg8cZxxpPDJB/ENbRg vsGq0067oOp+VN/6xJVteZAbUF5x6mMwrbEnhNlaCEuzKqApCC2ccnoXj9snJi/gXQ datf1F8FrC6AgBHZEl2KtPnDvqKxbPbyJQyp/qWLHO5l/I/SvtkghJ44E/GrYbps11 q4VU6PrynvKqS3tKWLyYt/kK+APx65ep19l4KQhybUhO5/qQTpVA0bOTyLmUeXtYnu CvcOO60jLx2TA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Geert Uytterhoeven , Dave Jiang , Vinod Koul , Sasha Levin , dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 1/9] dmaengine: ioat: depends on !UML Date: Mon, 13 Sep 2021 18:35:27 -0400 Message-Id: <20210913223535.436405-1-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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.30.2