diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-04 22:57:19 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-04 22:57:19 -0700 |
| commit | e6c340171f0daaccc95b90abbeed2b837157ee11 (patch) | |
| tree | 843d4035be59bd791321910e52157ce527b3b4b3 /include/linux/intel-iommu.h | |
| parent | Input: tegra - move platform data header (diff) | |
| parent | Linux 3.6-rc4 (diff) | |
| download | linux-dev-e6c340171f0daaccc95b90abbeed2b837157ee11.tar.xz linux-dev-e6c340171f0daaccc95b90abbeed2b837157ee11.zip | |
Merge tag 'v3.6-rc4' into next
Linux 3.6-rc4
# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"
Diffstat (limited to 'include/linux/intel-iommu.h')
| -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 */ |