Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 459121c9 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: introduce pci-dma.c 



This patch introduces pci-dma.c, a common file for pci dma
between i386 and x86_64. As a start, dma_set_mask() is the same
between architectures, and is placed there.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 19e395af

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o 
obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o

obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o setup64.o

obj-y			+= pci-dma_$(BITS).o  bootflag.o e820_$(BITS).o

obj-y			+= quirks.o i8237.o topology.o kdebugfs.o

obj-y			+= pci-dma.o quirks.o i8237.o topology.o kdebugfs.o

obj-y			+= alternative.o i8253.o

obj-$(CONFIG_X86_64)	+= pci-nommu_64.o bugs_64.o

obj-$(CONFIG_X86_32)	+= pci-base_32.o

arch/x86/kernel/pci-dma.c

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#include <linux/dma-mapping.h>



int dma_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask || !dma_supported(dev, mask))

		return -EIO;



	*dev->dma_mask = mask;



	return 0;

}

EXPORT_SYMBOL(dma_set_mask);

arch/x86/kernel/pci-dma_32.c

+0 −12
Original line number Diff line number Diff line
@@ -182,18 +182,6 @@ dma_supported(struct device *dev, u64 mask) 
}

EXPORT_SYMBOL(dma_supported);



int

dma_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask || !dma_supported(dev, mask))

		return -EIO;



	*dev->dma_mask = mask;



	return 0;

}

EXPORT_SYMBOL(dma_set_mask);





static __devinit void via_no_dac(struct pci_dev *dev)

{

arch/x86/kernel/pci-dma_64.c

+0 −9
Original line number Diff line number Diff line
@@ -213,15 +213,6 @@ int dma_supported(struct device *dev, u64 mask) 
}

EXPORT_SYMBOL(dma_supported);



int dma_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask || !dma_supported(dev, mask))

		return -EIO;

	*dev->dma_mask = mask;

	return 0;

}

EXPORT_SYMBOL(dma_set_mask);



/*

 * See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter

 * documentation.