From patchwork Wed Mar 6 18:24:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13584427 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 23C62C5475B for ; Wed, 6 Mar 2024 18:25:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77DF06B00A5; Wed, 6 Mar 2024 13:25:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7056B6B00A7; Wed, 6 Mar 2024 13:25:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E80C6B00A8; Wed, 6 Mar 2024 13:25:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 37D536B00A5 for ; Wed, 6 Mar 2024 13:25:24 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0955140658 for ; Wed, 6 Mar 2024 18:25:23 +0000 (UTC) X-FDA: 81867441768.07.53571E9 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf07.hostedemail.com (Postfix) with ESMTP id 4A4FB40010 for ; Wed, 6 Mar 2024 18:25:22 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=yVtMgmnC; spf=pass (imf07.hostedemail.com: domain of 3EbXoZQYKCFQEGD09x2AA270.yA8749GJ-886Hwy6.AD2@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3EbXoZQYKCFQEGD09x2AA270.yA8749GJ-886Hwy6.AD2@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=1709749522; 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=ce5q/5s2y8sTRUjXlJUoDQaDDC72MtCTDHZZLC1kTDU=; b=4XtkMhZrIwBdFkBoYD7mfuKoL2jamclidFiyNmyBDlKFV4CFcLP9/FgwRx2KG6sqZBw1mL gx+qvFliafC5CTnwXD3qoYBy+ZffiQA9Hg/SWmF4eRvvCE79KCe4SES8mWVU1b57f5OoSD RxemAYoQN7WWRdzTyFw1lYxfy3foQwI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709749522; a=rsa-sha256; cv=none; b=llhcrMFo3AQZA44TzDewPMDPGRm7ATv1FkM23DRB8E1c10jWRN6Cz2+pe7SgrfuWVIwu2k +fGQtEqxpB0vCn87ub36ldfNwgHbhZJJs0F3oh3miSB5mBPENYEZ7Dir6QOnu37aZ8KFb3 JjeS7cKWDoEiCsVQ8npNi1SLPhrByxk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=yVtMgmnC; spf=pass (imf07.hostedemail.com: domain of 3EbXoZQYKCFQEGD09x2AA270.yA8749GJ-886Hwy6.AD2@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3EbXoZQYKCFQEGD09x2AA270.yA8749GJ-886Hwy6.AD2@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60996cdc37cso160077b3.2 for ; Wed, 06 Mar 2024 10:25:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709749521; x=1710354321; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ce5q/5s2y8sTRUjXlJUoDQaDDC72MtCTDHZZLC1kTDU=; b=yVtMgmnCgd1eIOobdDD/OR6+DGWufgkBLJEk+NHCYPfRGJ9D4Ft+cAcT9wUR2apsE2 7+wXnky0h+J6BQyyuJk4fcFg6sgAsZO//BVFb2q5JAv0Vf44n1zfU0rQAdhPuVEnuHxD Tbo+UovOnnVa8DB3zyHNUMc2pJHUaFzjLGQIRLcwJOeBpkNqzaEcN+nzF4MGWpf+tqhO cpv6C5abNmj41ZuiUrXSh/n7SNkNW5YCTflWQrRdd0zEWSz6+Nn1b+xkEWYNvDfeaZ1f JWlkugJh78kO/2AmLIMZnAgVBXY66Xiaek72jeJzio26B/FTl3WgRXF2wyagDUu9B8wW HMcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709749521; x=1710354321; 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=ce5q/5s2y8sTRUjXlJUoDQaDDC72MtCTDHZZLC1kTDU=; b=KDDEzDHx/aQCnZ6FxEixA4AcIeXhKoUnGTweHrjebBZ/KxSVFjk0UQlDuz9ragBVlX VEtTEVTLep46cPbG0YZA0ri+QdUrvpZCIiFSlU1Vxy4CDt4gpV2PzsyTCed3Hg11nrZL T8mEPSyQZNQj1HxLXNnjIf1cvrc1nwv1EMMqJqKra4D61JSg7PMmXpPAU5t2XjOovxoJ CZE/2HGCdVQMDKW+7agD4nTiTsMBujtC1e5PIE8oHYwRJNM1ShzBrslumy7K/+9qmLVA wBeGwKgyz5OfsJeTJNpYSpB7V1283253zIy7ao36azZT+TkFwni/vcDBoRR6+jtCncGq G8/A== X-Forwarded-Encrypted: i=1; AJvYcCXouqLzonVsym8lDSgWhmX9MJmFZog8/8XDj2djfkO/dpd4lNS/T01f523cFPgxBoRsleQseihRxWifyWkY7pWeBZA= X-Gm-Message-State: AOJu0Yw/D4PPh/HJ16nZx8SBnfQ9iifDkxwfA0Dspdx6ernEgV9So+c+ IwQg7dPtj7GxCer7iZzttiPd8H7UyQ7FfTIDmpBzsPwRXupEkM6QOLP/dEBL1H0kLqt8ozqSGhl uRA== X-Google-Smtp-Source: AGHT+IH32/IZGhdtDhHfi0erFgA8zBoZwZ5Yl8o/YC76tmXsM0VTu/ocS/EURR3ecpb+NdvcUbRKq6AuK40= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:85f0:e3db:db05:85e2]) (user=surenb job=sendgmr) by 2002:a05:6902:1821:b0:dc7:9218:df3b with SMTP id cf33-20020a056902182100b00dc79218df3bmr687403ybb.10.1709749521260; Wed, 06 Mar 2024 10:25:21 -0800 (PST) Date: Wed, 6 Mar 2024 10:24:15 -0800 In-Reply-To: <20240306182440.2003814-1-surenb@google.com> Mime-Version: 1.0 References: <20240306182440.2003814-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240306182440.2003814-18-surenb@google.com> Subject: [PATCH v5 17/37] 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, penguin-kernel@i-love.sakura.ne.jp, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.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, jhubbard@nvidia.com, 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, vvvvvv@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, aliceryhl@google.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 X-Stat-Signature: pat54ebm3upsgxgejokks8zpyqcra8hx X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4A4FB40010 X-Rspam-User: X-HE-Tag: 1709749522-554255 X-HE-Meta: U2FsdGVkX1+V6nrRdHQDD6OrqOsY+lJtmnDbcOqqswuEc2778oPZdi+LBMXkPkGJ3iznZJtLHZyvaArvIAhGfeVYfCDD1l+/4Pn7z/czS56+NOw//QsQTRKt7/Y6YDxQrkuiAe1J1a80eiEQ9kouv+xvfBHZMQJ2kXRUL8N6sU3Kl8YNA4P7l4TP/cg3orqpLpxMYcuc/fNQA8bGMs1MOf87jgjC7VAY/GzOf7g2eRQ+CAKn/HsNbnBiJVLxMYc50h7fYGPNkG5f1uHMFtF3SXxvW+mud3dZ60jQuw7ehZSLa9laWWxqZDGHQrd7V9xltzLdKK9eBAbgy1GDsRQw3z0cFfG9QEHThZF8N6WY7S9tW/zdOwoBa/rSs/wwSD6/UyDOGVOFtTHR8P87nLs1IqexJjc8J3CrxT6nZkQ1H5jH847KppFUT3Y9G1UXjRryJnWawFICBlLYJV7J5/qGfbyPTgulPN8QchCjkFzE2ajMbIlAJey8YgZ4hDLq2pWKflDfo/HHGigX9u1f96hYRAP/UbHKSCCjr3s6CNXIab8q81l+ouo22CiqjZjQRc8S1AKvQQ8oh6PUcgZxAiyFPZTuSbcSe9sLbCAVICSLogXH5t+qO2y13QnFDqbwKsBBQtDo0r7uWe5ob1kkCmaKlIP1RW7II8YsHXKy7HRKI8v0JwDqHeKHvdj15MkP3UWea/x0soj8TA78NGiuwxu0YrNJy24HXo6jhGRVdswu858Mp3F2Ix+PVmo/S8r9ej+1G1/bO5asfAjXCriXqaj7e9jMmd/8+SZzy3J7PsjCxFrZoMvsSbCzkbrsv5sOYw9MDdaiJGq/c0Jc177Q18OoAwa6+7HhLhVUTc7475dZ7tCam14ej6GaA2aIbe1U5wjVpJ7VkrhQ+8oo4mMRZKUH96iOjHLp+rK+s30ZhpC2jnl1ILrVL0tEMGvukFW/2GtoHrwFwmlEFsULJzg8c0u +8Z022EJ xfbWQh6g/kK/lEych5flQzeaJ5y3Ea4pXCfFNcDPbGU/VOkLsPKtEirug3nYHGLTVTW/J/FQaTC2rM6qdi71iZKpa+VVT1roj6q9uz9Ntji/jjO9x4zxUPsNK8bhFP5d8F42D+c7Qs55ZrLbUidlPjJvu0c4C8X1elddBOkuJhMljJE0URl/tVYlJWi5GBfCARHTe/+qaCFhk0P5kgv+ypRTd7ifQtIl5VNpzjAqjBk5eBa6TIx3VYEHADOPtmTjNqjaCQXhwBG5ylaaMUgljJ4ev41dPO6BJgqFkIjP35pqQ0Z/+9a1JPcK7j2Ko/yx78zz3k0te7f0dibU+fiKYiUiuGNqa8qykVc8jO2NW4URgk34XadABWBRnBSmODIg6Q3PaDUXZz4GRGX1MlVXdFhaJTBjKmxS2H1aOFxh3q48A189ZgNs8VwNZ3olAdTZB845cjtsaWitcJyZgwj+pLEvTkQ== 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: List-Subscribe: List-Unsubscribe: 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/alpha/kernel/pci_iommu.c | 2 +- arch/mips/jazz/jazzdma.c | 2 +- arch/powerpc/kernel/dma-iommu.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 4 ++-- arch/powerpc/platforms/pseries/vio.c | 2 +- arch/x86/kernel/amd_gart_64.c | 2 +- drivers/iommu/dma-iommu.c | 2 +- drivers/parisc/ccio-dma.c | 2 +- drivers/parisc/sba_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 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index c81183935e97..7fcf3e9b7103 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -929,7 +929,7 @@ const struct dma_map_ops alpha_pci_ops = { .dma_supported = alpha_pci_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, }; EXPORT_SYMBOL(alpha_pci_ops); diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index eabddb89d221..c97b089b9902 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c @@ -617,7 +617,7 @@ const struct dma_map_ops jazz_dma_ops = { .sync_sg_for_device = jazz_dma_sync_sg_for_device, .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, }; EXPORT_SYMBOL(jazz_dma_ops); diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c index 8920862ffd79..f0ae39e77e37 100644 --- a/arch/powerpc/kernel/dma-iommu.c +++ b/arch/powerpc/kernel/dma-iommu.c @@ -216,6 +216,6 @@ const struct dma_map_ops dma_iommu_ops = { .get_required_mask = dma_iommu_get_required_mask, .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/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index d6b5f5ecd515..56dc6b29a3e7 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c @@ -695,7 +695,7 @@ static const struct dma_map_ops ps3_sb_dma_ops = { .unmap_page = ps3_unmap_page, .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, }; @@ -709,7 +709,7 @@ static const struct dma_map_ops ps3_ioc0_dma_ops = { .unmap_page = ps3_unmap_page, .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/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c index 2dc9cbc4bcd8..0c90fc4c3796 100644 --- a/arch/powerpc/platforms/pseries/vio.c +++ b/arch/powerpc/platforms/pseries/vio.c @@ -611,7 +611,7 @@ static const struct dma_map_ops vio_dma_mapping_ops = { .get_required_mask = dma_iommu_get_required_mask, .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/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c index 2ae98f754e59..c884deca839b 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 50ccc4f1ef81..8a1f7f5d1bca 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1710,7 +1710,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/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 9ce0d20a6c58..feef537257d0 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -1022,7 +1022,7 @@ static const struct dma_map_ops ccio_ops = { .map_sg = ccio_map_sg, .unmap_sg = ccio_unmap_sg, .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/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 784037837f65..fc3863c09f83 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c @@ -1090,7 +1090,7 @@ static const struct dma_map_ops sba_ops = { .map_sg = sba_map_sg, .unmap_sg = sba_unmap_sg, .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/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index 76f6f26265a3..29257d2639db 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 0e6c6c25d154..1c4ef5111651 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -403,7 +403,7 @@ 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, .max_mapping_size = swiotlb_max_mapping_size, }; diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index 4abc60f04209..9ee319851b5f 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -29,7 +29,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 58db8fd70471..5e2d51e1cdf6 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,