31c31
< __FBSDID("$FreeBSD: head/sys/x86/iommu/intel_gas.c 257251 2013-10-28 13:33:29Z kib $");
---
> __FBSDID("$FreeBSD: stable/10/sys/x86/iommu/intel_gas.c 259512 2013-12-17 13:49:35Z kib $");
95c95,96
< if (res != NULL)
---
> if (res != NULL) {
> res->ctx = ctx;
96a98
> }
103a106,108
> KASSERT(ctx == entry->ctx,
> ("mismatched free ctx %p entry %p entry->ctx %p", ctx,
> entry, entry->ctx));
172a178,180
> KASSERT(ctx == entry->ctx,
> ("mismatched free ctx %p entry %p entry->ctx %p", ctx,
> entry, entry->ctx));
586c594
< static void
---
> void
647,650c655
< DMAR_CTX_LOCK(ctx);
< dmar_gas_free_space(ctx, entry);
< DMAR_CTX_UNLOCK(ctx);
< dmar_gas_free_entry(ctx, entry);
---
> dmar_ctx_unload_entry(entry, true);
692,695c697
< DMAR_CTX_LOCK(ctx);
< dmar_gas_free_region(ctx, entry);
< DMAR_CTX_UNLOCK(ctx);
< entry->flags = 0;
---
> dmar_ctx_unload_entry(entry, false);