projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21aff52
)
iommu/iova: Fix compile error with CONFIG_IOMMU_IOVA=m
author
Joerg Roedel
<jroedel@suse.de>
Wed, 22 Mar 2017 23:06:17 +0000
(
00:06
+0100)
committer
Joerg Roedel
<jroedel@suse.de>
Wed, 22 Mar 2017 23:06:17 +0000
(
00:06
+0100)
The #ifdef in iova.h only catches the CONFIG_IOMMU_IOVA=y
case, so that compilation as a module fails with duplicate
function definition errors. Fix it by catching both cases in
the #if.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
include/linux/iova.h
patch
|
blob
|
blame
|
history
diff --git
a/include/linux/iova.h
b/include/linux/iova.h
index 548982ad5f2fdfca66427c1b62a756511429594f..e0a892ae45c0834a82d42e06a6bfab65b424c899 100644
(file)
--- a/
include/linux/iova.h
+++ b/
include/linux/iova.h
@@
-82,7
+82,7
@@
static inline unsigned long iova_pfn(struct iova_domain *iovad, dma_addr_t iova)
return iova >> iova_shift(iovad);
}
-#if
def CONFIG_IOMMU_IOVA
+#if
IS_ENABLED(CONFIG_IOMMU_IOVA)
int iova_cache_get(void);
void iova_cache_put(void);