Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "Add build script for continuous integration"
[kvmfornfv.git]
/
kernel
/
drivers
/
iommu
/
intel-iommu.c
diff --git
a/kernel/drivers/iommu/intel-iommu.c
b/kernel/drivers/iommu/intel-iommu.c
index
c87c4b1
..
c234279
100644
(file)
--- a/
kernel/drivers/iommu/intel-iommu.c
+++ b/
kernel/drivers/iommu/intel-iommu.c
@@
-681,6
+681,7
@@
static inline struct context_entry *iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
+ entry = &root->lo;
if (ecs_enabled(iommu)) {
if (devfn >= 0x80) {
devfn -= 0x80;
@@
-688,7
+689,6
@@
static inline struct context_entry *iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
- entry = &root->lo;
if (*entry & 1)
context = phys_to_virt(*entry & VTD_PAGE_MASK);
else {