arm64: use generic dma-contiguous.h (2f06dbe4) · Commits · 戴 / test

dma-contiguous.h is now in asm-generic. Use that to avoid code repetition in arm64. Signed-off-by:

Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Acked-by:

Michal Nazarewicz <mina86@mina86.com> Acked-by:

Catalin Marinas <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/7358/ Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

arch/arm64/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ generic-y += current.h
		generic-y += delay.h
		generic-y += div64.h
		generic-y += dma.h
		generic-y += dma-contiguous.h
		generic-y += emergency-restart.h
		generic-y += early_ioremap.h
		generic-y += errno.h

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

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#ifndef _ASM_DMA_CONTIGUOUS_H
		#define _ASM_DMA_CONTIGUOUS_H

		#ifdef __KERNEL__
		#ifdef CONFIG_DMA_CMA

		#include <linux/types.h>

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

		#endif
		#endif

		#endif

Admin message