projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
ttm
/
ttm_page_alloc_dma.c
diff --git
a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index 7957beeeaf733752e58c6b57f5d5a5a531113a09..fb8259f698395a286e28fbe1053bc70e04821694 100644
(file)
--- a/
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@
-33,6
+33,7
@@
* when freed).
*/
+#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU)
#define pr_fmt(fmt) "[TTM] " fmt
#include <linux/dma-mapping.h>
@@
-1142,3
+1143,5
@@
int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data)
return 0;
}
EXPORT_SYMBOL_GPL(ttm_dma_page_alloc_debugfs);
+
+#endif