From: nicolas.pitre@linaro.org (Nicolas Pitre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/10] ARM: add dma_zone_size to the machine_desc structure
Date: Tue, 05 Jul 2011 22:30:34 -0400 [thread overview]
Message-ID: <1309919442-20451-2-git-send-email-nicolas.pitre@linaro.org> (raw)
In-Reply-To: <1309919442-20451-1-git-send-email-nicolas.pitre@linaro.org>
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
---
arch/arm/include/asm/mach/arch.h | 4 ++++
arch/arm/kernel/setup.c | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 946f4d7..7b79a00 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -23,6 +23,10 @@ struct machine_desc {
unsigned int nr_irqs; /* number of IRQs */
+#ifdef CONFIG_ZONE_DMA
+ unsigned long dma_zone_size; /* size of DMA-able area */
+#endif
+
unsigned int video_start; /* start of video RAM */
unsigned int video_end; /* end of video RAM */
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index ed11fb0..e0db84d 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -916,6 +916,12 @@ void __init setup_arch(char **cmdline_p)
cpu_init();
tcm_init();
+#ifdef CONFIG_ZONE_DMA
+ if (mdesc->dma_zone_size) {
+ extern unsigned long arm_dma_zone_size;
+ arm_dma_zone_size = mdesc->dma_zone_size;
+ }
+#endif
#ifdef CONFIG_MULTI_IRQ_HANDLER
handle_arch_irq = mdesc->handle_irq;
#endif
--
1.7.4
next prev parent reply other threads:[~2011-07-06 2:30 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-06 2:30 [PATCH 01/10] ARM: change ARM_DMA_ZONE_SIZE into a variable Nicolas Pitre
2011-07-06 2:30 ` Nicolas Pitre [this message]
2011-07-06 23:10 ` [PATCH 02/10] ARM: add dma_zone_size to the machine_desc structure Russell King - ARM Linux
2011-07-07 2:59 ` Nicolas Pitre
2011-07-06 2:30 ` [PATCH 03/10] ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size Nicolas Pitre
2011-07-06 2:30 ` [PATCH 04/10] ARM: mach-h720x: " Nicolas Pitre
2011-07-06 2:30 ` [PATCH 05/10] ARM: mach-ixp4xx: " Nicolas Pitre
2011-07-06 23:12 ` Russell King - ARM Linux
2011-07-07 3:31 ` Nicolas Pitre
2011-07-06 2:30 ` [PATCH 06/10] ARM: mach-pxa: " Nicolas Pitre
2011-07-06 2:30 ` [PATCH 07/10] ARM: mach-realview: " Nicolas Pitre
2011-07-06 23:15 ` Russell King - ARM Linux
2011-07-07 3:59 ` Nicolas Pitre
2011-07-06 2:30 ` [PATCH 08/10] ARM: mach-sa1100: move " Nicolas Pitre
2011-07-06 2:30 ` [PATCH 09/10] ARM: mach-shark: " Nicolas Pitre
2011-07-06 2:30 ` [PATCH 10/10] ARM: ARM_DMA_ZONE_SIZE is no more Nicolas Pitre
2011-07-06 2:48 ` [PATCH 01/10] ARM: change ARM_DMA_ZONE_SIZE into a variable Barry Song
2011-07-06 3:12 ` Nicolas Pitre
2011-07-06 23:09 ` Russell King - ARM Linux
2011-07-07 2:50 ` Nicolas Pitre
2011-07-07 16:17 ` Arnd Bergmann
2011-07-07 17:08 ` John Linn
2011-07-07 17:40 ` Arnd Bergmann
2011-07-08 8:59 ` Russell King - ARM Linux
2011-07-08 13:58 ` John Linn
2011-07-08 16:23 ` Russell King - ARM Linux
2011-07-07 18:15 ` Grant Likely
2011-07-06 23:04 ` Russell King - ARM Linux
2011-07-07 2:46 ` Nicolas Pitre
2011-07-08 12:14 ` Russell King - ARM Linux
2011-07-08 20:30 ` Russell King - ARM Linux
2011-07-09 8:12 ` Russell King - ARM Linux
2011-07-09 8:13 ` Russell King - ARM Linux
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=1309919442-20451-2-git-send-email-nicolas.pitre@linaro.org \
--to=nicolas.pitre@linaro.org \
--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).