Skip to content

Commit fac83d2

Browse files
Jean-Philippe Bruckerwildea01
authored andcommitted
iommu/io-pgtable-arm: Fix pgtable allocation in selftest
Commit 4b12375 ("iommu/io-pgtable-arm: Make allocations NUMA-aware") added a NUMA hint to page table allocation, but the pgtable selftest doesn't provide an SMMU device parameter. Since dev_to_node doesn't accept a NULL argument, add a special case for selftest. Signed-off-by: Jean-Philippe Brucker <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent ce397d2 commit fac83d2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/iommu/io-pgtable-arm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp,
237237
void *pages;
238238

239239
VM_BUG_ON((gfp & __GFP_HIGHMEM));
240-
p = alloc_pages_node(dev_to_node(dev), gfp | __GFP_ZERO, order);
240+
p = alloc_pages_node(dev ? dev_to_node(dev) : NUMA_NO_NODE,
241+
gfp | __GFP_ZERO, order);
241242
if (!p)
242243
return NULL;
243244

0 commit comments

Comments
 (0)