Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4381640pxv; Tue, 29 Jun 2021 05:54:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFdrtrShKCylFYRexjLFABmD698xnR/niiU+CQjic3OXpDxIahb+OFq9TfbMShcfu7oSLJ X-Received: by 2002:a50:9b06:: with SMTP id o6mr40593491edi.284.1624971265486; Tue, 29 Jun 2021 05:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624971265; cv=none; d=google.com; s=arc-20160816; b=DznOwmAYtHcPEON+C72enC0voRg4qVY9v/BpTBsG5Ui7gPqd5q1Fmw3xn8ar6IzZPW PLxSA/0vNSTpRDcqbkhNRlkcY9TIssn16QW/hUsOWyEmClvu9ebpboqKg2C9i+W0jtHX hWClmTXSXgvS6wu/I5El3tcz6l0UIFZWE/YIXc2BKHZWWmbnWJSXL4Vr+XszBBuQ1Twy KHB2mJmMhXNrMhIFeOTUNi9fT8ZkEObd8Wst1lw6osl9SClNeGIGezMKzkwr76tgSmlW IVGxMyuMlyqt1JzeB5lgaPz/QbchNPv5Dmsik7u8Mrsqtq487ynm6c+cdkxo9m4mpEBF A1fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=1eAjia3nJz8ckUvMUB3/a4DkeEy77c4H/omWY5urY6s=; b=gAj8o6t4WJPe21YPYS4PKzNlA3A86kdCf6/cVIjpf7+REb6DuTh8PTR/zbulkQHGiY DcF+dyyY1+bP/b94ewPwPWj5tF/+9xCEmL7mL+nOFS2NeamodGNwP4/Tf8mR7ihw25qO YhiEqFTqmVqg4zrDwf+lW0xAaZ+iU6Bd2b+aZK404nLq/yEuRnTVuDLgVDRewqDpkRhF V7wQcskckn2ndi7hy12pqlu0cbtlHEW9zTbO90fQt455OlVm3n0l1g8BKkDNJPz7pRnL oRdRCxGmpBYeItGTiv5evzscUgEHwaQEOrA+z9Zk7ZPy6KQfcrnnlIgkMrQHckyLLGAF n5dg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qw15si3675515ejb.24.2021.06.29.05.54.02; Tue, 29 Jun 2021 05:54:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234012AbhF2MzI (ORCPT + 99 others); Tue, 29 Jun 2021 08:55:08 -0400 Received: from foss.arm.com ([217.140.110.172]:50542 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233497AbhF2Myr (ORCPT ); Tue, 29 Jun 2021 08:54:47 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 04B5B106F; Tue, 29 Jun 2021 05:52:20 -0700 (PDT) Received: from [10.57.46.146] (unknown [10.57.46.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 67C163F718; Tue, 29 Jun 2021 05:52:18 -0700 (PDT) Subject: Re: [PATCH v2] swiotlb: fix implicit debugfs_create_dir declaration To: Claire Chang , konrad.wilk@oracle.com, hch@lst.de, m.szyprowski@samsung.com, Will Deacon , sstabellini@kernel.org Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, tfiga@chromium.org, Nicolas Boichat , kernel test robot References: <20210629121625.3633999-1-tientzu@chromium.org> From: Robin Murphy Message-ID: <7f544c68-721c-bbcc-3614-cbadce7261a9@arm.com> Date: Tue, 29 Jun 2021 13:52:14 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210629121625.3633999-1-tientzu@chromium.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021-06-29 13:16, Claire Chang wrote: > Remove the ifdef to fix implicit function declaration for other pools. > > Fixes: 1d9f94400a7a ("swiotlb: Refactor swiotlb_create_debugfs") There doesn't appear to be a problem with that commit - AFAICS it's 461021875c50 ("swiotlb: Add restricted DMA pool initialization") which introduces a reference to debugfs_create_dir() outside the existing #ifdef guards. FWIW (assuming it's the real problem) I'd be inclined to factor out the debugfs bits from rmem_swiotlb_device_init() into a separate rmem_swiotlb_debugfs_init() (or similar) function which can live alongside the others under the #ifdef and be stubbed out in an #else case. Robin. > Reported-by: kernel test robot > Signed-off-by: Claire Chang > --- > kernel/dma/swiotlb.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c > index 0ffbaae9fba2..8ae0bef392c3 100644 > --- a/kernel/dma/swiotlb.c > +++ b/kernel/dma/swiotlb.c > @@ -36,9 +36,7 @@ > #include > #include > #include > -#ifdef CONFIG_DEBUG_FS > #include > -#endif > #ifdef CONFIG_DMA_RESTRICTED_POOL > #include > #include > @@ -686,7 +684,6 @@ bool is_swiotlb_active(struct device *dev) > } > EXPORT_SYMBOL_GPL(is_swiotlb_active); > > -#ifdef CONFIG_DEBUG_FS > static struct dentry *debugfs_dir; > > static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem) > @@ -709,8 +706,6 @@ static int __init swiotlb_create_default_debugfs(void) > > late_initcall(swiotlb_create_default_debugfs); > > -#endif > - > #ifdef CONFIG_DMA_RESTRICTED_POOL > struct page *swiotlb_alloc(struct device *dev, size_t size) > { >