Page MenuHomeFreeBSD

D35832.diff
No OneTemporary

D35832.diff

diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -868,7 +868,7 @@
}
void
-dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free)
+iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free)
{
struct dmar_domain *domain;
struct dmar_unit *unit;
@@ -902,15 +902,15 @@
}
void
-dmar_domain_unload(struct dmar_domain *domain,
+iommu_domain_unload(struct iommu_domain *iodom,
struct iommu_map_entries_tailq *entries, bool cansleep)
{
+ struct dmar_domain *domain;
struct dmar_unit *unit;
- struct iommu_domain *iodom;
struct iommu_map_entry *entry, *entry1;
int error __diagused;
- iodom = DOM2IODOM(domain);
+ domain = IODOM2DOM(iodom);
unit = DOM2DMAR(domain);
TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) {
@@ -975,21 +975,3 @@
dmar_free_ctx(ctx);
}
-
-void
-iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free)
-{
-
- dmar_domain_unload_entry(entry, free);
-}
-
-void
-iommu_domain_unload(struct iommu_domain *iodom,
- struct iommu_map_entries_tailq *entries, bool cansleep)
-{
- struct dmar_domain *domain;
-
- domain = IODOM2DOM(iodom);
-
- dmar_domain_unload(domain, entries, cansleep);
-}
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -277,9 +277,6 @@
void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx);
void dmar_free_ctx(struct dmar_ctx *ctx);
struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid);
-void dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free);
-void dmar_domain_unload(struct dmar_domain *domain,
- struct iommu_map_entries_tailq *entries, bool cansleep);
void dmar_domain_free_entry(struct iommu_map_entry *entry, bool free);
void dmar_dev_parse_rmrr(struct dmar_domain *domain, int dev_domain,

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 27, 8:11 AM (16 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17815226
Default Alt Text
D35832.diff (1 KB)

Event Timeline