diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
| commit | 6d5e2bf9d203e4d9e08ca2e9420c6ff22ad190af (patch) | |
| tree | c2c20648773d3326f942e34ef73b06566f7a19ec /drivers/iommu/amd_iommu_init.c | |
| parent | b820d52e7eed7b30b2dfef5f4213a2bc3cbea6f3 (diff) | |
| parent | 257f9053c0204ea47491aa236004fd1226f75fa8 (diff) | |
Merge branch 'acpi-utils' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-5.2
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index f773792d77fd..1b1378619fc9 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2013,6 +2013,9 @@ static int __init init_unity_map_range(struct ivmd_header *m) if (e == NULL) return -ENOMEM; + if (m->flags & IVMD_FLAG_EXCL_RANGE) + init_exclusion_range(m); + switch (m->type) { default: kfree(e); @@ -2059,9 +2062,7 @@ static int __init init_memory_definitions(struct acpi_table_header *table) while (p < end) { m = (struct ivmd_header *)p; - if (m->flags & IVMD_FLAG_EXCL_RANGE) - init_exclusion_range(m); - else if (m->flags & IVMD_FLAG_UNITY_MAP) + if (m->flags & (IVMD_FLAG_UNITY_MAP | IVMD_FLAG_EXCL_RANGE)) init_unity_map_range(m); p += m->length; |