diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-08-22 17:24:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-08-22 17:24:48 -0400 |
| commit | 471b25a2fcbb25dccd7c9bece30313f2440a554e (patch) | |
| tree | f05460402fae7fd7a48f51a4bba16d0ab0695fa7 /Documentation | |
| parent | cf6fc5eefc5bbbbff92a085039ff74cdbd065c29 (diff) | |
| parent | 447c6141e8ea68ef4e56c55144fd18f43e6c8dca (diff) | |
| download | linux-471b25a2fcbb25dccd7c9bece30313f2440a554e.tar.gz linux-471b25a2fcbb25dccd7c9bece30313f2440a554e.tar.bz2 linux-471b25a2fcbb25dccd7c9bece30313f2440a554e.zip | |
Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd
Pull iommufd fixes from Jason Gunthorpe:
"Two very minor fixes:
- Fix mismatched kvalloc()/kfree()
- Spelling fixes in documentation"
* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
iommufd: Fix spelling errors in iommufd.rst
iommufd: viommu: free memory allocated by kvcalloc() using kvfree()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/userspace-api/iommufd.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/userspace-api/iommufd.rst b/Documentation/userspace-api/iommufd.rst index 03f7510384d2..f1c4d21e5c5e 100644 --- a/Documentation/userspace-api/iommufd.rst +++ b/Documentation/userspace-api/iommufd.rst @@ -43,7 +43,7 @@ Following IOMMUFD objects are exposed to userspace: - IOMMUFD_OBJ_HWPT_PAGING, representing an actual hardware I/O page table (i.e. a single struct iommu_domain) managed by the iommu driver. "PAGING" - primarly indicates this type of HWPT should be linked to an IOAS. It also + primarily indicates this type of HWPT should be linked to an IOAS. It also indicates that it is backed by an iommu_domain with __IOMMU_DOMAIN_PAGING feature flag. This can be either an UNMANAGED stage-1 domain for a device running in the user space, or a nesting parent stage-2 domain for mappings @@ -76,7 +76,7 @@ Following IOMMUFD objects are exposed to userspace: * Security namespace for guest owned ID, e.g. guest-controlled cache tags * Non-device-affiliated event reporting, e.g. invalidation queue errors - * Access to a sharable nesting parent pagetable across physical IOMMUs + * Access to a shareable nesting parent pagetable across physical IOMMUs * Virtualization of various platforms IDs, e.g. RIDs and others * Delivery of paravirtualized invalidation * Direct assigned invalidation queues |