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

Commit a5e9d38b authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

ARM: 6186/1: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds 



This macro is not defined when !CONFIG_MMU so this patch moves the
CONSISTENT_* definitions to the CONFIG_MMU section.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 980019d7

arch/arm/mm/dma-mapping.c

+9 −9
Original line number Diff line number Diff line
@@ -24,15 +24,6 @@ 
#include <asm/tlbflush.h>

#include <asm/sizes.h>



/* Sanity check size */

#if (CONSISTENT_DMA_SIZE % SZ_2M)

#error "CONSISTENT_DMA_SIZE must be multiple of 2MiB"

#endif



#define CONSISTENT_OFFSET(x)	(((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT)

#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PGDIR_SHIFT)

#define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PGDIR_SHIFT)



static u64 get_coherent_dma_mask(struct device *dev)

{

	u64 mask = ISA_DMA_THRESHOLD;
@@ -123,6 +114,15 @@ static void __dma_free_buffer(struct page *page, size_t size) 
}



#ifdef CONFIG_MMU

/* Sanity check size */

#if (CONSISTENT_DMA_SIZE % SZ_2M)

#error "CONSISTENT_DMA_SIZE must be multiple of 2MiB"

#endif



#define CONSISTENT_OFFSET(x)	(((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT)

#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PGDIR_SHIFT)

#define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PGDIR_SHIFT)



/*

 * These are the page tables (2MB each) covering uncached, DMA consistent allocations

 */