diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 17:47:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 17:47:39 -0700 |
| commit | e97eace635a42da4644290179aea496178e64988 (patch) | |
| tree | 8f9fed17b6f2cbaa78fd4e7f8e77c78a9560cb22 /include | |
| parent | 334fe5d3a99aea2e92b934b4c58fffee9b056c5d (diff) | |
| parent | 620bf9f981365c18cc2766c53d92bf8131c63f32 (diff) | |
| download | linux-e97eace635a42da4644290179aea496178e64988.tar.bz2 | |
Merge tag 'iommu-fixes-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
"Intel VT-d fixes:
- Fix a lockdep splat issue in intel_iommu_init()
- Allow NVS regions to pass RMRR check
- Domain cleanup in error path"
* tag 'iommu-fixes-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Clean up si_domain in the init_dmars() error path
iommu/vt-d: Allow NVS regions in arch_rmrr_sanity_check()
iommu/vt-d: Use rcu_lock in get_resv_regions
iommu: Add gfp parameter to iommu_alloc_resv_region
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index a325532aeab5..3c9da1f8979e 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -455,7 +455,7 @@ extern void iommu_set_default_translated(bool cmd_line); extern bool iommu_default_passthrough(void); extern struct iommu_resv_region * iommu_alloc_resv_region(phys_addr_t start, size_t length, int prot, - enum iommu_resv_type type); + enum iommu_resv_type type, gfp_t gfp); extern int iommu_get_group_resv_regions(struct iommu_group *group, struct list_head *head); |