projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
[linux-2.6-block.git]
/
drivers
/
pci
/
intel-iommu.h
diff --git
a/drivers/pci/intel-iommu.h
b/drivers/pci/intel-iommu.h
index ee88dd2400cb83ad13eb2ba44beea4e22704281d..459ad1f9dc549f5d84635c93429a1dafdd44a978 100644
(file)
--- a/
drivers/pci/intel-iommu.h
+++ b/
drivers/pci/intel-iommu.h
@@
-58,7
+58,7
@@
hi = readl(dmar + reg + 4); \
(((u64) hi) << 32) + lo; })
*/
-static inline u64 dmar_readq(void *addr)
+static inline u64 dmar_readq(void
__iomem
*addr)
{
u32 lo, hi;
lo = readl(addr);