From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 18 Mar 2009 10:50:29 +0000 (+0100)
Subject: dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG
X-Git-Tag: firefly_0821_release~15189^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=84be58d4601c86306cd939ebf58a9b90989883a4;p=firefly-linux-kernel-4.4.55.git

dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG

Impact: build fix

Fix:

 arch/x86/kvm/x86.o: In function `dma_debug_add_bus':
 (.text+0x0): multiple definition of `dma_debug_add_bus'

dma_debug_add_bus() should be a static inline function.

Cc: Joerg Roedel <joerg.roedel@amd.com>
LKML-Reference: <20090317120112.GP6159@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index e851d23e91eb..28d53cb7b5a2 100644
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -83,7 +83,7 @@ extern void debug_dma_dump_mappings(struct device *dev);
 
 #else /* CONFIG_DMA_API_DEBUG */
 
-void dma_debug_add_bus(struct bus_type *bus)
+static inline void dma_debug_add_bus(struct bus_type *bus)
 {
 }