diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-29 00:51:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:41:32 -0400 |
| commit | 4fe05bbcd53160616774b6f5619b8a55bcfa1c57 (patch) | |
| tree | f6b03c6b5013ddb3ab13f7521d593d6bed5b1886 /drivers/pci/intel-iommu.h | |
| parent | b4a08a10b12c145da67cc788849bf7cc6efaa210 (diff) | |
intel-iommu fixes
- off by one in dmar_get_fault_reason() (maximal index in array is
ARRAY_SIZE()-1, not ARRAY_SIZE())
- NULL noise removal
- __iomem annotation fix
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pci/intel-iommu.h')
| -rw-r--r-- | drivers/pci/intel-iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.h b/drivers/pci/intel-iommu.h index ee88dd2400cb..459ad1f9dc54 100644 --- a/drivers/pci/intel-iommu.h +++ b/drivers/pci/intel-iommu.h | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | hi = readl(dmar + reg + 4); \ | 58 | hi = readl(dmar + reg + 4); \ |
| 59 | (((u64) hi) << 32) + lo; }) | 59 | (((u64) hi) << 32) + lo; }) |
| 60 | */ | 60 | */ |
| 61 | static inline u64 dmar_readq(void *addr) | 61 | static inline u64 dmar_readq(void __iomem *addr) |
| 62 | { | 62 | { |
| 63 | u32 lo, hi; | 63 | u32 lo, hi; |
| 64 | lo = readl(addr); | 64 | lo = readl(addr); |