diff options
| author | kib <kib@FreeBSD.org> | 2015-06-05 08:36:25 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-06-05 08:36:25 +0000 |
| commit | 8adebdc1fb2155471d30ae8e1658f04043f30091 (patch) | |
| tree | ac0fd4ac26d5483f8db92a69e2f3069d09468c6a /sys/x86 | |
| parent | 0a8cb339c3fc968720a3a61ef4613d05badcabb9 (diff) | |
| download | FreeBSD-src-8adebdc1fb2155471d30ae8e1658f04043f30091.zip FreeBSD-src-8adebdc1fb2155471d30ae8e1658f04043f30091.tar.gz | |
MFC r283735:
Remove several write-only variables.
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/iommu/busdma_dmar.c | 4 | ||||
| -rw-r--r-- | sys/x86/iommu/intel_idpgtbl.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/x86/iommu/busdma_dmar.c b/sys/x86/iommu/busdma_dmar.c index b81556c..72026c5 100644 --- a/sys/x86/iommu/busdma_dmar.c +++ b/sys/x86/iommu/busdma_dmar.c @@ -815,7 +815,6 @@ dmar_bus_task_dmamap(void *arg, int pending) struct bus_dma_tag_dmar *tag; struct bus_dmamap_dmar *map; struct dmar_unit *unit; - struct dmar_ctx *ctx; unit = arg; DMAR_LOCK(unit); @@ -823,7 +822,6 @@ dmar_bus_task_dmamap(void *arg, int pending) TAILQ_REMOVE(&unit->delayed_maps, map, delay_link); DMAR_UNLOCK(unit); tag = map->tag; - ctx = map->tag->ctx; map->cansleep = true; map->locked = false; bus_dmamap_load_mem((bus_dma_tag_t)tag, (bus_dmamap_t)map, @@ -844,9 +842,7 @@ dmar_bus_task_dmamap(void *arg, int pending) static void dmar_bus_schedule_dmamap(struct dmar_unit *unit, struct bus_dmamap_dmar *map) { - struct dmar_ctx *ctx; - ctx = map->tag->ctx; map->locked = false; DMAR_LOCK(unit); TAILQ_INSERT_TAIL(&unit->delayed_maps, map, delay_link); diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 5eac9f00..19edec7 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -107,7 +107,7 @@ static void ctx_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, dmar_gaddr_t addr) { - vm_page_t m, m1; + vm_page_t m1; dmar_pte_t *pte; struct sf_buf *sf; dmar_gaddr_t f, pg_sz; @@ -117,7 +117,7 @@ ctx_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, VM_OBJECT_ASSERT_LOCKED(tbl->pgtbl_obj); if (addr >= tbl->maxaddr) return; - m = dmar_pgalloc(tbl->pgtbl_obj, idx, DMAR_PGF_OBJL | DMAR_PGF_WAITOK | + (void)dmar_pgalloc(tbl->pgtbl_obj, idx, DMAR_PGF_OBJL | DMAR_PGF_WAITOK | DMAR_PGF_ZERO); base = idx * DMAR_NPTEPG + 1; /* Index of the first child page of idx */ pg_sz = pglvl_page_size(tbl->pglvl, lvl); @@ -597,7 +597,7 @@ ctx_unmap_buf_locked(struct dmar_ctx *ctx, dmar_gaddr_t base, dmar_pte_t *pte; struct sf_buf *sf; vm_pindex_t idx; - dmar_gaddr_t pg_sz, base1, size1; + dmar_gaddr_t pg_sz; int lvl; DMAR_CTX_ASSERT_PGLOCKED(ctx); @@ -624,8 +624,6 @@ ctx_unmap_buf_locked(struct dmar_ctx *ctx, dmar_gaddr_t base, KASSERT((flags & ~DMAR_PGF_WAITOK) == 0, ("invalid flags %x", flags)); pg_sz = 0; /* silence gcc */ - base1 = base; - size1 = size; flags |= DMAR_PGF_OBJL; TD_PREP_PINNED_ASSERT; |
