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

Commit 889ae645 authored by Atul Raut's avatar Atul Raut Committed by Gerrit - the friendly Code Review server
Browse files

arm64: fix build when !CONFIG_DMA_CMA 



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: default avatarAtul Raut <araut@codeaurora.org>
parent 981dbde5

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

+13 −2
Original line number Diff line number Diff line 
/*

 * 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

#define ASMARM_DMA_CONTIGUOUS_H



#ifdef __KERNEL__

#ifdef CONFIG_DMA_CMA



#include <linux/types.h>



void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);



#endif

#endif



#endif

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

+1 −4
Original line number Diff line number Diff line 
/*

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -15,7 +15,6 @@ 
#define _ASM_DMA_CONTIGUOUS_H



#ifdef __KERNEL__

#ifdef CONFIG_DMA_CMA



#include <linux/types.h>
@@ -23,5 +22,3 @@ void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size); 


#endif

#endif
 


#endif