evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64: fix build when !CONFIG_DMA_CMA

Browse source 
if !CONFIG_DMA_CMA throws error implicit declaration of function
‘dma_contiguous_early_fixup’ in routine
drivers/base/dma-removed.c:removed_dma_setup which has no
dependency over CONFIG_DMA_CMA.
Fix by removing dependency of CONFIG_DMA_CMA flag
for function dma_contiguous_early_fixup

CRs-Fixed: 1117213
Change-Id: Ife6d0399b7ae61d1781212a1ae7525378fb920fc
Signed-off-by: Atul Raut <araut@codeaurora.org>
This commit is contained in:
Atul Raut 2017-01-29 21:20:05 -08:00 • committed by Gerrit - the friendly Code Review server
parent 57dcf47eb5
commit f517b4d3a8
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/arm/include/asm/dma-contiguous.h
View file

@ -1,14 +1,25 @@
/*
* Copyright (c) 2016-2017, 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 ASMARM_DMA_CONTIGUOUS_H #ifndef ASMARM_DMA_CONTIGUOUS_H
#define ASMARM_DMA_CONTIGUOUS_H #define ASMARM_DMA_CONTIGUOUS_H
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_DMA_CMA
#include <linux/types.h> #include <linux/types.h>
void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size); void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);
#endif
#endif #endif
#endif #endif

5
arch/arm64/include/asm/dma-contiguous.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, The Linux Foundation. All rights reserved. * Copyright (c) 2013,2016-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -15,7 +15,6 @@
#define _ASM_DMA_CONTIGUOUS_H #define _ASM_DMA_CONTIGUOUS_H
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_DMA_CMA
#include <linux/types.h> #include <linux/types.h>
@ -23,5 +22,3 @@ void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);
#endif #endif
#endif #endif
#endif