diff options
| author | Hiroshi Doyu <hdoyu@nvidia.com> | 2013-09-24 07:57:12 +0300 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-27 12:54:00 -0700 |
| commit | 16ac6a3229ea8d0638bfca5f3ff72c2b14dbc749 (patch) | |
| tree | 8dc47f32ee68c43447f32e1867b53f825ded71de | |
| parent | d5736591967a297ab734ab40bb3f47ba7ea7b3fa (diff) | |
ARM: dma-mapping: Undefined debug_dma_platformdata
Fix undefined reference to debug_dma_platformdata
Bug 1373902
Change-Id: I77544b64f84e8e43a9bfb873f6b2af375d341f0d
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Reviewed-on: http://git-master/r/278134
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
GVS: Gerrit_Virtual_Submit
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 8 | ||||
| -rw-r--r-- | include/linux/dma-debug.h | 3 | ||||
| -rw-r--r-- | include/trace/events/dmadebug.h | 4 | ||||
| -rw-r--r-- | lib/dma-debug.c | 8 |
4 files changed, 12 insertions, 11 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index a5651396e6a9..665e5c1d86bd 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1121,6 +1121,14 @@ static int __init dma_debug_do_init(void) } fs_initcall(dma_debug_do_init); +char *__weak debug_dma_platformdata(struct device *dev) +{ + /* empty string by default */ + static char buf[1]; + + return buf; +} + #ifdef CONFIG_ARM_DMA_USE_IOMMU /* IOMMU */ diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h index fc0e34ce038f..258dc12fa013 100644 --- a/include/linux/dma-debug.h +++ b/include/linux/dma-debug.h @@ -185,4 +185,7 @@ static inline void debug_dma_dump_mappings(struct device *dev) #endif /* CONFIG_DMA_API_DEBUG */ +/* get architecture specific interesting data */ +char *debug_dma_platformdata(struct device *dev); + #endif /* __DMA_DEBUG_H */ diff --git a/include/trace/events/dmadebug.h b/include/trace/events/dmadebug.h index c0929b969188..615151434640 100644 --- a/include/trace/events/dmadebug.h +++ b/include/trace/events/dmadebug.h @@ -30,9 +30,7 @@ #include <linux/tracepoint.h> #include <linux/types.h> #include <linux/device.h> - -/* get architecture specific interesting data */ -char *debug_dma_platformdata(struct device *dev); +#include <linux/dma-debug.h> DECLARE_EVENT_CLASS(dmadebug, TP_PROTO(struct device *dev, dma_addr_t dma_addr, size_t size, \ diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 0fe2791d0e47..6f01db6fc567 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -752,14 +752,6 @@ out_unlock: return count; } -char *__weak debug_dma_platformdata(struct device *dev) -{ - /* empty string by default */ - static char buf[1]; - - return buf; -} - static inline void seq_print_ip_sym(struct seq_file *s, unsigned long ip) { seq_printf(s, "[<%p>] %pS\n", (void *)ip, (void *)ip); |