diff options
| author | Vikram Hegde <Vikram.Hegde@Sun.COM> | 2009-07-30 11:09:45 -0700 |
|---|---|---|
| committer | Vikram Hegde <Vikram.Hegde@Sun.COM> | 2009-07-30 11:09:45 -0700 |
| commit | b51bbbf59a7a1941f5e9531370c2f87d8cd7f621 (patch) | |
| tree | dcd3144b874c19fcdf4a11a1d29b9e2eed9bf0b5 /usr/src/uts/intel | |
| parent | 46129c212ab4570ca5c6f845fe853f7e18789976 (diff) | |
| download | illumos-gate-b51bbbf59a7a1941f5e9531370c2f87d8cd7f621.tar.gz | |
6859941 fix for 6855752 is incorrect
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/io/iommulib.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/sys/iommulib.h | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/usr/src/uts/intel/io/iommulib.c b/usr/src/uts/intel/io/iommulib.c index 2a7482e1d8..173e03de0d 100644 --- a/usr/src/uts/intel/io/iommulib.c +++ b/usr/src/uts/intel/io/iommulib.c @@ -576,7 +576,7 @@ iommulib_nex_open(dev_info_t *rdip, uint_t *errorp) *errorp = 0; - if (IOMMULIB_HDL(rdip)) + if (IOMMU_USED(rdip)) return (DDI_SUCCESS); ASSERT(DEVI(rdip)->devi_iommulib_handle == NULL); diff --git a/usr/src/uts/intel/sys/iommulib.h b/usr/src/uts/intel/sys/iommulib.h index a13864f5f7..a765179c3f 100644 --- a/usr/src/uts/intel/sys/iommulib.h +++ b/usr/src/uts/intel/sys/iommulib.h @@ -98,16 +98,9 @@ typedef struct iommulib_ops { /* - * IOMMULIB_HDL() checks if there is an IOMMU controlling the dip's DMA - * IOMMU_USED() checks if the dip associated with the DMA handle has DMA - * controlled by an IOMMU. - * This ensures that we use the right dip associated with the - * DMA handle irrespective of which dip's context we call - * ddi_dma_* routines in. + * IOMMU_USED() checks if there is an IOMMU controlling the dip's DMA */ -#define IOMMULIB_HDL(dip) (DEVI(dip)->devi_iommulib_handle) -#define IOMMU_USED(dmahdl) \ -(DEVI(((struct ddi_dma_impl *)(dmahdl))->dmai_rdip)->devi_iommulib_handle) +#define IOMMU_USED(dip) (DEVI(dip)->devi_iommulib_handle) typedef enum { IOMMU_NEXOPS_VERSION_INVALID = 0, |