diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 10:39:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 10:39:32 -0700 |
| commit | ceee0e95b67401ea34118a54369496ecdfb9a199 (patch) | |
| tree | 2fabbc32a96b398646a256d2d09d98104d40081f /include | |
| parent | Linux 3.5 (diff) | |
| parent | iommu/dmar: Use pr_format() instead of PREFIX to tidy up pr_*() calls (diff) | |
| download | linux-dev-ceee0e95b67401ea34118a54369496ecdfb9a199.tar.xz linux-dev-ceee0e95b67401ea34118a54369496ecdfb9a199.zip | |
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core/iommu changes from Ingo Molnar.
* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
iommu/dmar: Use pr_format() instead of PREFIX to tidy up pr_*() calls
iommu/dmar: Reserve mmio space used by the IOMMU, if the BIOS forgets to
iommu/dmar: Replace printks with appropriate pr_*()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/intel-iommu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index e6ca56de9936..78e2ada50cd5 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -308,6 +308,8 @@ enum { struct intel_iommu { void __iomem *reg; /* Pointer to hardware regs, virtual addr */ + u64 reg_phys; /* physical address of hw register set */ + u64 reg_size; /* size of hw register set */ u64 cap; u64 ecap; u32 gcmd; /* Holds TE, EAFL. Don't need SRTP, SFL, WBF */ |