diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /lib/swiotlb.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'lib/swiotlb.c')
| -rw-r--r-- | lib/swiotlb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index e4399fa..4e8686c 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -38,9 +38,6 @@ #include <linux/bootmem.h> #include <linux/iommu-helper.h> -#define CREATE_TRACE_POINTS -#include <trace/events/swiotlb.h> - #define OFFSET(val,align) ((unsigned long) \ ( (val) & ( (align) - 1))) @@ -505,7 +502,6 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, not_found: spin_unlock_irqrestore(&io_tlb_lock, flags); - dev_warn(hwdev, "swiotlb buffer is full\n"); return SWIOTLB_MAP_ERROR; found: spin_unlock_irqrestore(&io_tlb_lock, flags); @@ -730,8 +726,6 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, if (dma_capable(dev, dev_addr, size) && !swiotlb_force) return dev_addr; - trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force); - /* Oh well, have to allocate and map a bounce buffer. */ map = map_single(dev, phys, size, dir); if (map == SWIOTLB_MAP_ERROR) { |