diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-05-13 21:30:15 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-05-13 21:30:15 +0300 |
commit | 82045dd85566d87128dcc66277cf1177d9930a4a (patch) | |
tree | 22fea6311a4866293005a1a44f34310e4007a3c9 /drivers/iommu/amd_iommu_init.c | |
parent | e0478542cfd4d993e38d5f92a3f3ecd238805e96 (diff) | |
parent | ffa6f55eb6188ee73339cab710fabf30d13110a7 (diff) | |
download | linux-82045dd85566d87128dcc66277cf1177d9930a4a.tar.xz |
Merge branch 'linus' into core/urgent, to merge in dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
-rw-r--r-- | drivers/iommu/amd_iommu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 1b1378619fc9..ff40ba758cf3 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -359,7 +359,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val) static void iommu_set_exclusion_range(struct amd_iommu *iommu) { u64 start = iommu->exclusion_start & PAGE_MASK; - u64 limit = (start + iommu->exclusion_length) & PAGE_MASK; + u64 limit = (start + iommu->exclusion_length - 1) & PAGE_MASK; u64 entry; if (!iommu->exclusion_start) |