nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvmap: Fix build for Linux v6.14

Browse Source 
In Linux v6.14, the 'page_list' argument was dropped from the
__alloc_pages_bulk() function. Add a test to conftest to check for this
and update the NVMAP driver accordlingly to fix the build.

Jira LINQPJ14-6

Change-Id: Id3513890a9d948cb42abf7449d9fb3aa95edcf96
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3297065
(cherry picked from commit a7d79ff243f922e112bc85a0830455e3e422a04c)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3499755
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
Tested-by: Brad Griffis <bgriffis@nvidia.com>
This commit is contained in:
Jon Hunter
2025-01-14 12:27:44 +00:00
committed by mobile promotions
parent 774a1ec13d
commit 34b4ec7938
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/tegra/nvmap/nvmap_alloc.c
View File

@@ -573,8 +573,13 @@ static int handle_page_alloc(struct nvmap_client *client,
if (page_index < nr_page) {
int nid = h->numa_id == NUMA_NO_NODE ? numa_mem_id() : h->numa_id;
#if defined(NV__ALLOC_PAGES_BULK_HAS_NO_PAGE_LIST_ARG)
allocated = __alloc_pages_bulk(gfp, nid, NULL,
nr_page, pages);
#else
allocated = __alloc_pages_bulk(gfp, nid, NULL,
nr_page, NULL, pages);
#endif
}
#endif
for (i = allocated; i < nr_page; i++) {