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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D833C77B61 for ; Mon, 1 May 2023 16:55:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0C38900017; Mon, 1 May 2023 12:55:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BBC15900002; Mon, 1 May 2023 12:55:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0E47900017; Mon, 1 May 2023 12:55:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 92A4E900002 for ; Mon, 1 May 2023 12:55:54 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6ED60120818 for ; Mon, 1 May 2023 16:55:54 +0000 (UTC) X-FDA: 80742288228.13.00A3ABB Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 8D11F40011 for ; Mon, 1 May 2023 16:55:52 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=hhMiGEI+; spf=pass (imf04.hostedemail.com: domain of 3F-9PZAYKCF4OQNAJ7CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3F-9PZAYKCF4OQNAJ7CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682960152; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LeC1gX4P3RQjW1NYELsxA3PFCP+EdMyYyajg3MbW7ME=; b=G9gTYi18mXCz/+/2xjAX+YTgkIsgxYLKC00tQi8MzlKwiOmKwhcAGtZ1Mapb/8iNJvkzhG B1V+UIzPLKPf/wr7JQe9PCuzX906TogtA3AvmPIVcWHT8FCA4+7EnfMwQBrOcZ0BNAo76y XtvRru2LcC9+As2NU8fufWj/JiCdczA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682960152; a=rsa-sha256; cv=none; b=4QXpZ2TVn3P8SzrQOAxCxviRGf2l82ZSp9j3gjV1ZWGSNAcFCcZx0df8oM/92lr/JQW8zO PzZ8ixqn2fWHkhfKfuuwLvlxUcrneFzr51dwfrtgrZGpk6CXhu+wDovzpjP8tTH58oezip ductBggLarQt72Hx+Y8dKC469zhxFS4= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=hhMiGEI+; spf=pass (imf04.hostedemail.com: domain of 3F-9PZAYKCF4OQNAJ7CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3F-9PZAYKCF4OQNAJ7CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-556011695d1so45700607b3.1 for ; Mon, 01 May 2023 09:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682960151; x=1685552151; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LeC1gX4P3RQjW1NYELsxA3PFCP+EdMyYyajg3MbW7ME=; b=hhMiGEI+67cfIr24zB7jRNLa5lThUyRZeDPUTiHuwGakXI2KeF15k1Fm45C272zpQV qXSafKQv0FF+5oEv4p+76TG6tqqAwOk8ME5PBGvQt4pav/Pg3OYN+Hq4oMgw3F6ZdSvk RmJQnKNLzSXmDQCmLfbgpYZMfqGB21dxyyqy9AGFiAL7FUCD/QaAfwt7HNGi0uvHJu82 6NgN1S+GtTfGCTv2eTqAiK6fBQsiqTLf20nkiQTXY3Jq4fbsHdFYt1d0Idxgqw9T5cZH WVbgLVG1ivKLyqdpAiO34AXCSDhpXsNhycXd99B9WHPgsZw1MFzj6S84fK28jMLqmH9m yXMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682960151; x=1685552151; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LeC1gX4P3RQjW1NYELsxA3PFCP+EdMyYyajg3MbW7ME=; b=Wgiz9QwWqmpRyeklyQyx5zzi9zF0gw6tSNEz1Gk7ApL0SXuA4GDt/wEFI8PKlCeONr oXje7VRa3l3kzyoEdlQmMREEiv5HEwFEZG+TYLBbImZdJAJMtO2vE4vmzEx757E8RRKg X8tn2zEqHlda7L9gFs8fnr+JDhtegdweHxhMVtNM9nMY0RfUB8IZzLK92/+FGJMKzpWz YRrG8xEFETO72MTZN2V2CbT08M276S2r73zpUH6nGVrc0L2EkiC34V3k1P5FCjy3mU7R PNl5fEbeRM0KO/AquEGzBd2++sHeMYQDPzyosWEvU+DQm4oE6E+NWQTLMMr+Ce2mEvoy o7pw== X-Gm-Message-State: AC+VfDwt2o04+tVVbkVWKHMYxb8BEongXfstP6G+VCLaSeSReYHq+xbq dzKq9zPBGsN64NfzeVe2dNhLT5KcmrY= X-Google-Smtp-Source: ACHHUZ6D5LZLB8pLCoAY1h4u51zZbpSuAM6Xxjtp7fyAseeyuJw1iO6kg4WYdKeb69llNdIv4RH/p4cKKOU= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:6d24:3efd:facc:7ac4]) (user=surenb job=sendgmr) by 2002:a0d:ec4c:0:b0:55a:20a3:5ce3 with SMTP id r12-20020a0dec4c000000b0055a20a35ce3mr2799132ywn.3.1682960151497; Mon, 01 May 2023 09:55:51 -0700 (PDT) Date: Mon, 1 May 2023 09:54:29 -0700 In-Reply-To: <20230501165450.15352-1-surenb@google.com> Mime-Version: 1.0 References: <20230501165450.15352-1-surenb@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230501165450.15352-20-surenb@google.com> Subject: [PATCH 19/40] change alloc_pages name in dma_map_ops to avoid name conflicts From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, ldufour@linux.ibm.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, shakeelb@google.com, songmuchun@bytedance.com, jbaron@akamai.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Queue-Id: 8D11F40011 X-Rspamd-Server: rspam09 X-Stat-Signature: mrnop6jbobr831nqxa914tmb7cdtturn X-HE-Tag: 1682960152-773461 X-HE-Meta: U2FsdGVkX1/S2RAWhJHEgvPASOet4QhA2M5Z45cT6h9wn8qmLm6N6zrQNYfcdsiArYh73x21+B16FkMXa0JRaKp+T1OigLtKyCz2AjJVMHYTF02kHzoSkJYUjVEMjrP6pLngasR6PqIq2W7D1hfxMKpB8JJK/hfgsxF9hr5QRgcJC7Dbk6eI//i4rGnNYkxUjwD0ulh4EvV9tpMfg4Dio0jeO90Nq2/Xa9K/trz4UlG8DuebfWEJ9YVLZh3aLUoLXHVne9aJtniCvbPnUNmuKmZ1zTK4ViVskDyxjqLrgBIXdxFxRhbHHRMji+Bt8xw0In/v67kUZgNdrDJPQKAw7RdsGkpWiLEO4StJBKs6ZCBllxNH3y9SUhs4iV07FeDkTBuAnIsm8jAlPK6nSBoi7cBD5ZN1chmwkAg0cfBY6byj9FnLTs4tt8uziIngG8g7XaX2ly7xOzRN8sDYy/HHBCY5mBtPLJHI+UTuftq2TsRyWxoiAc8hPzXdQej76VbeQ4v7hHwiNhd6EithaeeF+h4upy3nukQXXwZykSpynLxg1CNx0L4KEDsNt/EKJLXdrd3Wt2k2+TqAywY2PMC60gRosZPnN5oyRrZV/YEiba5ttsY9TaWl4NmYs64ckXeDxRqNo6TaFaxk4Fl+E/7EJf6fYWfrA103VzNbgplhwrb8V3sy+Qv6sewEYwhze3Joxdo0KtQtjzkKuICadcCM2GA/+dSsemonltot4EoJoZJXN8AH5cq9vqbVEwctUQk1F0fy0AnhMCKQVX8D8gobTkRGO73rY29y5vjIL4ZUQGRH8Bgv0C8VZzMXRiS3GbHqs2MKuMS09EEdclj2w7nF6/Z/SpgfTZSBWJjnX06QACgAk0a3AgTatgFED3GVP0yReqhyntSQu0r8mzII2zbq6xJFJd2YMMjmz9pSaznpjITa1UGI+6scq4MaBbERTQLoGGMBWTlfO0SvJwloR4g LDo8zrpF 8FMPd1eG6xUw83veNUyd1eIJ4oqVA28fwTXp4/jbU1iXCxGlZqP7IKkTDQ9tLl/I+iBMebuWrzanVJeVBMrrWfKtpT82N3iO6PJXcnelY8PaCHMT6Y05wwaRImF7fgoKlJkBSHmNQIkX+ZhqYLLUM5poXXdb0I6wG5W+jBgM9CAU0b6VtMf7YE8dV7JoXwOWYVbkoaWE24a8tSEWelrRWXn86YRM6RYuKyuZY/4YHVFtQe7y1ibMo61LCOLVrpDAkHxzifyW43kHXxnQzhVv2nlxuDaBc6MJTeaXIvWDKLLYhikesCRbUIzf34Wa4aZmSG0pn0KHSPJ/iv6etq0DY5bvKnKTj+pSiKWhjflVNU+Ey+SN/hcXaxIoPzHBqOMyzJuNQNy3PsAhHLkazwo+ibhQWHJJBRY94ag0MnFDm56Db5102EKymn8eHECjVZroN8PXSWe0GtGhlqyMJas08N7LVcYXqUIjvRahOOJH44bTNRYXXfsR/lVAykn2k1RTfGPSCV0hBxMqM+O3YedZYkxnlkUNF2aJijejPz07i2uxyU3y6bP8KEF1Xa0nfxLSS/YuZ/3cbJaMUVyIxkJk5VBSq2gF1NBaBhgELFCiQUEjfAZraWYkyfxOHpt45SxKb+d9G/Y+XfD0nQTNCsf0xHb1V059hmhTKZwxcPwNVG5Pss/qHW2dbLea5Gy/4Rw7SO2uZkjfAPybTFETEPYfgLsN7f30h7W+hDe3h X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: After redefining alloc_pages, all uses of that name are being replaced. Change the conflicting names to prevent preprocessor from replacing them when it's not intended. Signed-off-by: Suren Baghdasaryan --- arch/x86/kernel/amd_gart_64.c | 2 +- drivers/iommu/dma-iommu.c | 2 +- drivers/xen/grant-dma-ops.c | 2 +- drivers/xen/swiotlb-xen.c | 2 +- include/linux/dma-map-ops.h | 2 +- kernel/dma/mapping.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c index 56a917df410d..842a0ec5eaa9 100644 --- a/arch/x86/kernel/amd_gart_64.c +++ b/arch/x86/kernel/amd_gart_64.c @@ -676,7 +676,7 @@ static const struct dma_map_ops gart_dma_ops = { .get_sgtable = dma_common_get_sgtable, .dma_supported = dma_direct_supported, .get_required_mask = dma_direct_get_required_mask, - .alloc_pages = dma_direct_alloc_pages, + .alloc_pages_op = dma_direct_alloc_pages, .free_pages = dma_direct_free_pages, }; diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 7a9f0b0bddbd..76a9d5ca4eee 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1556,7 +1556,7 @@ static const struct dma_map_ops iommu_dma_ops = { .flags = DMA_F_PCI_P2PDMA_SUPPORTED, .alloc = iommu_dma_alloc, .free = iommu_dma_free, - .alloc_pages = dma_common_alloc_pages, + .alloc_pages_op = dma_common_alloc_pages, .free_pages = dma_common_free_pages, .alloc_noncontiguous = iommu_dma_alloc_noncontiguous, .free_noncontiguous = iommu_dma_free_noncontiguous, diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index 9784a77fa3c9..6c7d984f164d 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -282,7 +282,7 @@ static int xen_grant_dma_supported(struct device *dev, u64 mask) static const struct dma_map_ops xen_grant_dma_ops = { .alloc = xen_grant_dma_alloc, .free = xen_grant_dma_free, - .alloc_pages = xen_grant_dma_alloc_pages, + .alloc_pages_op = xen_grant_dma_alloc_pages, .free_pages = xen_grant_dma_free_pages, .mmap = dma_common_mmap, .get_sgtable = dma_common_get_sgtable, diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 67aa74d20162..5ab2616153f0 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -403,6 +403,6 @@ const struct dma_map_ops xen_swiotlb_dma_ops = { .dma_supported = xen_swiotlb_dma_supported, .mmap = dma_common_mmap, .get_sgtable = dma_common_get_sgtable, - .alloc_pages = dma_common_alloc_pages, + .alloc_pages_op = dma_common_alloc_pages, .free_pages = dma_common_free_pages, }; diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index 31f114f486c4..d741940dcb3b 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -27,7 +27,7 @@ struct dma_map_ops { unsigned long attrs); void (*free)(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, unsigned long attrs); - struct page *(*alloc_pages)(struct device *dev, size_t size, + struct page *(*alloc_pages_op)(struct device *dev, size_t size, dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp); void (*free_pages)(struct device *dev, size_t size, struct page *vaddr, diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 9a4db5cce600..fc42930af14b 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -570,9 +570,9 @@ static struct page *__dma_alloc_pages(struct device *dev, size_t size, size = PAGE_ALIGN(size); if (dma_alloc_direct(dev, ops)) return dma_direct_alloc_pages(dev, size, dma_handle, dir, gfp); - if (!ops->alloc_pages) + if (!ops->alloc_pages_op) return NULL; - return ops->alloc_pages(dev, size, dma_handle, dir, gfp); + return ops->alloc_pages_op(dev, size, dma_handle, dir, gfp); } struct page *dma_alloc_pages(struct device *dev, size_t size, -- 2.40.1.495.gc816e09b53d-goog