Commit 8057b308 authored Jul 16, 2014 by Zubair Lutfullah Kakakhel Committed by Ralf Baechle Sep 22, 2014

x86: use generic dma-contiguous.h



dma-contiguous.h is now in asm-generic. Use that to avoid code
repetition in x86.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: catalin.marinas@arm.com
Cc: will.deacon@arm.com
Cc: tglx@linutronix.de
Cc: mingo@redhat.com
Cc: hpa@zytor.com
Cc: arnd@arndb.de
Cc: gregkh@linuxfoundation.org
Cc: m.szyprowski@samsung.com
Cc: x86@kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-arch@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7359/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 2f06dbe4

arch/x86/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ genhdr-y += unistd_x32.h

		generic-y += clkdev.h
		generic-y += cputime.h
		generic-y += dma-contiguous.h
		generic-y += early_ioremap.h
		generic-y += mcs_spinlock.h
		generic-y += scatterlist.h

arch/x86/include/asm/dma-contiguous.h

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		#ifndef ASMX86_DMA_CONTIGUOUS_H
		#define ASMX86_DMA_CONTIGUOUS_H

		#ifdef __KERNEL__

		#include <linux/types.h>

		static inline void
		dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }

		#endif
		#endif