From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/7] ARM: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds
Date: Thu, 20 May 2010 14:21:47 +0100 [thread overview]
Message-ID: <20100520132147.7521.71018.stgit@e102109-lin.cambridge.arm.com> (raw)
In-Reply-To: <20100520131833.7521.66668.stgit@e102109-lin.cambridge.arm.com>
This macro is not defined when !CONFIG_MMU.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm/mm/dma-mapping.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 13fa536..c4de90f 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -25,6 +25,7 @@
#include <asm/sizes.h>
/* Sanity check size */
+#ifdef CONFIG_MMU
#if (CONSISTENT_DMA_SIZE % SZ_2M)
#error "CONSISTENT_DMA_SIZE must be multiple of 2MiB"
#endif
@@ -32,6 +33,7 @@
#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)
+#endif
static u64 get_coherent_dma_mask(struct device *dev)
{
next prev parent reply other threads:[~2010-05-20 13:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-20 13:21 [PATCH 0/7] Patches for 2.6.35 Catalin Marinas
2010-05-20 13:21 ` [PATCH 1/7] ARM: Improve the L2 cache performance when PL310 is used Catalin Marinas
2010-05-20 13:21 ` [PATCH 2/7] ARM: Align machine_desc.phys_io to a 1MB section Catalin Marinas
2010-05-20 13:21 ` Catalin Marinas [this message]
2010-05-20 13:21 ` [PATCH 4/7] ARM: The v6_dma_inv_range() function must preserve data on SMP Catalin Marinas
2010-05-20 13:21 ` [PATCH 5/7] ARM: Add a config option for the ARM11MPCore DMA cache maintenance workaround Catalin Marinas
2010-05-20 13:22 ` [PATCH 6/7] ARM: Add support for the MOVW/MOVT relocations in Thumb-2 Catalin Marinas
2010-05-20 13:22 ` [PATCH 7/7] ARM: Remove dummy loads from the original relocation address Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100520132147.7521.71018.stgit@e102109-lin.cambridge.arm.com \
--to=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).