lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: move definition to pci-dma.c

Browse Source 
Move dma_ops structure definition to pci-dma.c, where it
belongs.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Glauber Costa
2008-04-08 13:20:50 -03:00
committed by Ingo Molnar
parent d741bde26d
commit 85c246ee16
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/pci-base_32.c
View File

@@ -37,7 +37,7 @@ static int pci32_map_error(dma_addr_t dma_addr)
return 0; return 0;
} }
static const struct dma_mapping_ops pci32_dma_ops = { const struct dma_mapping_ops pci32_dma_ops = {
.map_single = pci32_map_single, .map_single = pci32_map_single,
.unmap_single = NULL, .unmap_single = NULL,
.map_sg = pci32_dma_map_sg, .map_sg = pci32_dma_map_sg,
@@ -51,5 +51,10 @@ static const struct dma_mapping_ops pci32_dma_ops = {
.mapping_error = pci32_map_error, .mapping_error = pci32_map_error,
}; };
const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; /* this is temporary */
EXPORT_SYMBOL(dma_ops); int __init no_iommu_init(void)
{
dma_ops = &pci32_dma_ops;
return 0;
}
fs_initcall(no_iommu_init);

3
arch/x86/kernel/pci-dma.c
View File

@@ -1,5 +1,8 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
const struct dma_mapping_ops *dma_ops;
EXPORT_SYMBOL(dma_ops);
int dma_set_mask(struct device *dev, u64 mask) int dma_set_mask(struct device *dev, u64 mask)
{ {
if (!dev->dma_mask || !dma_supported(dev, mask)) if (!dev->dma_mask || !dma_supported(dev, mask))

3
arch/x86/mm/init_64.c
View File

@@ -47,9 +47,6 @@
#include <asm/numa.h> #include <asm/numa.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
const struct dma_mapping_ops *dma_ops;
EXPORT_SYMBOL(dma_ops);
static unsigned long dma_reserve __initdata; static unsigned long dma_reserve __initdata;
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);