diff options
| author | Jean-Philippe Brucker <jean-philippe.brucker@arm.com> | 2018-06-18 12:27:54 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-07-26 11:34:58 +0100 |
| commit | fac83d29d95471ad6a104f8c0d21669a3d59097b (patch) | |
| tree | 0657ce23344c0a5be2ca6cb9b45be0b99f6e7043 /drivers/iommu/io-pgtable-arm.c | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
iommu/io-pgtable-arm: Fix pgtable allocation in selftest
Commit 4b123757eeaa ("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 <jean-philippe.brucker@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/io-pgtable-arm.c')
| -rw-r--r-- | drivers/iommu/io-pgtable-arm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 010a254305dd..88641b4560bc 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -237,7 +237,8 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp, void *pages; VM_BUG_ON((gfp & __GFP_HIGHMEM)); - p = alloc_pages_node(dev_to_node(dev), gfp | __GFP_ZERO, order); + p = alloc_pages_node(dev ? dev_to_node(dev) : NUMA_NO_NODE, + gfp | __GFP_ZERO, order); if (!p) return NULL; |