From: Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
joerg.roedel@amd.com, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:core/iommu] dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG
Date: Wed, 18 Mar 2009 10:00:00 GMT [thread overview]
Message-ID: <tip-84be58d4601c86306cd939ebf58a9b90989883a4@git.kernel.org> (raw)
In-Reply-To: <20090317120112.GP6159@amd.com>
Commit-ID: 84be58d4601c86306cd939ebf58a9b90989883a4
Gitweb: http://git.kernel.org/tip/84be58d4601c86306cd939ebf58a9b90989883a4
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Wed, 18 Mar 2009 11:50:29 +0100
Commit: Ingo Molnar <mingo@elte.hu>
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@amd.com>
LKML-Reference: <20090317120112.GP6159@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
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)
{
}
next prev parent reply other threads:[~2009-03-18 10:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-16 17:05 [PATCH 0/3] dma-debug: add additional checks Joerg Roedel
2009-03-16 17:05 ` [PATCH 1/3] dma-debug: add checks for kernel text and rodata Joerg Roedel
2009-03-16 17:05 ` [PATCH 2/3] dma-debug: add a check dma memory leaks Joerg Roedel
2009-03-16 17:05 ` [PATCH 3/3] dma-debug/x86: register pci bus for dma-debug leak detection Joerg Roedel
2009-03-17 12:01 ` [PATCH 0/3] dma-debug: add additional checks Joerg Roedel
2009-03-18 9:38 ` Ingo Molnar
2009-03-18 11:20 ` forcedeth 0000:00:0a.0: DMA-API: device driver frees DMA memory with wrong function [device address=0x0000000035992232] [size=42 bytes] [mapped as single] [unmapped as page] Ingo Molnar
2009-03-18 11:23 ` [PATCH 0/3] dma-debug: add additional checks Ingo Molnar
2009-03-18 11:38 ` Peter Zijlstra
2009-03-18 11:57 ` [tip:core/locking] lockdep: add stack dumps to asserts Peter Zijlstra
2009-03-18 12:19 ` [PATCH 0/3] dma-debug: add additional checks Joerg Roedel
2009-03-18 12:28 ` Peter Zijlstra
2009-03-18 12:45 ` Ingo Molnar
2009-03-31 12:57 ` [tip:core/locking] lockdep: add stack dumps to asserts Peter Zijlstra
2009-03-18 11:28 ` e1000e 0000:04:00.0: DMA-API: device driver frees DMA memory with wrong function [device address=0x000000003e5a2c02] [size=42 bytes] [mapped as single] [unmapped as page] Ingo Molnar
2009-03-18 11:56 ` [PATCH 0/3] dma-debug: add additional checks Joerg Roedel
2009-03-18 12:04 ` e1000e 0000:00:19.0: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x0000000052ff084a] [size=90 bytes] Ingo Molnar
2009-03-18 12:04 ` Ingo Molnar
2009-03-18 12:54 ` Lubomir Rintel
2009-03-18 12:54 ` Lubomir Rintel
2009-03-18 14:09 ` Ingo Molnar
2009-03-18 14:21 ` forcedeth 0000:00:0a.0: DMA-API: device driver frees DMA memory with wrong function [device address=0x0000000035992232] [size=42 bytes] [mapped as single] [unmapped as page] Ingo Molnar
2009-03-18 16:43 ` e1000e 0000:00:19.0: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x0000000052ff084a] [size=90 bytes] Brandeburg, Jesse
2009-03-18 16:47 ` Ingo Molnar
2009-03-18 16:47 ` Ingo Molnar
2009-03-18 17:41 ` Brandeburg, Jesse
2009-03-18 17:53 ` Ingo Molnar
2009-03-18 17:53 ` Ingo Molnar
2009-03-20 17:33 ` 3c59x 0000:00:0b.0: DMA-API: device driver maps memory from kernel text or rodata [addr=c0fffe54] [size=428] Ingo Molnar
2009-03-20 17:33 ` Ingo Molnar
2009-03-18 10:00 ` Ingo Molnar [this message]
2009-03-18 11:54 ` [tip:core/iommu] dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-84be58d4601c86306cd939ebf58a9b90989883a4@git.kernel.org \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=joerg.roedel@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.