diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-09-25 05:29:49 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-09-25 05:29:49 +0100 |
| commit | d322ce9e5e9bb437d93bf09b5354eede23491de7 (patch) | |
| tree | 7a3cc5a877d01d51391e9f27a5a929aae8eda1e3 /usr/src/uts/common/os/sunddi.c | |
| parent | 2408d5be4d43f2c643cbcf11db3a58722a9153b2 (diff) | |
| parent | 2807a6ec36a80c58154d9929cf429e8d6100f20a (diff) | |
| download | illumos-joyent-d322ce9e5e9bb437d93bf09b5354eede23491de7.tar.gz | |
Merge remote-tracking branch 'illumos/master' into gcc/upgrade
Conflicts:
usr/src/common/dis/i386/dis_tables.c
Diffstat (limited to 'usr/src/uts/common/os/sunddi.c')
| -rw-r--r-- | usr/src/uts/common/os/sunddi.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/usr/src/uts/common/os/sunddi.c b/usr/src/uts/common/os/sunddi.c index ab6e26a124..ee3fa51b95 100644 --- a/usr/src/uts/common/os/sunddi.c +++ b/usr/src/uts/common/os/sunddi.c @@ -7332,24 +7332,6 @@ ddi_dma_mem_alloc(ddi_dma_handle_t handle, size_t length, if (*handlep == NULL) return (DDI_FAILURE); -/* SPARC mappings are always cacheable, as SPARC guarantees cache coherency. */ -#ifndef __sparc - /* Transform attributes into correct cache flags. */ - if ((flags & IOMEM_DATA_MASK) == 0) { - switch (accattrp->devacc_attr_dataorder) { - case DDI_STRICTORDER_ACC: - flags |= IOMEM_DATA_UNCACHED; - break; - case DDI_MERGING_OK_ACC: - flags |= IOMEM_DATA_UC_WR_COMBINE; - break; - default: - flags |= IOMEM_DATA_CACHED; - break; - } - } -#endif - /* check if the cache attributes are supported */ if (i_ddi_check_cache_attr(flags) == B_FALSE) return (DDI_FAILURE); |