Copy&paste bug :( Thanks for the fix. On Wed, Mar 18, 2009 at 10:00:00AM +0000, Ingo Molnar wrote: > Commit-ID: 84be58d4601c86306cd939ebf58a9b90989883a4 > Gitweb: http://git.kernel.org/tip/84be58d4601c86306cd939ebf58a9b90989883a4 > Author: Ingo Molnar <mingo@xxxxxxx> > AuthorDate: Wed, 18 Mar 2009 11:50:29 +0100 > Commit: Ingo Molnar <mingo@xxxxxxx> > CommitDate: Wed, 18 Mar 2009 11:53:48 +0100 > > 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@xxxxxxx> > LKML-Reference: <20090317120112.GP6159@xxxxxxx> > Signed-off-by: Ingo Molnar <mingo@xxxxxxx> > > > --- > include/linux/dma-debug.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h > index e851d23..28d53cb 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) > { > } > > -- | Advanced Micro Devices GmbH Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München System | Research | Geschäftsführer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München | Registergericht München, HRB Nr. 43632 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html