| Message ID | 1309919442-20451-2-git-send-email-nicolas.pitre@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 05, 2011 at 10:30:34PM -0400, Nicolas Pitre wrote: > 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 */ Please try to keep the formatting the same.
On Thu, 7 Jul 2011, Russell King - ARM Linux wrote: > On Tue, Jul 05, 2011 at 10:30:34PM -0400, Nicolas Pitre wrote: > > 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 */ > > Please try to keep the formatting the same. Oops, sure. That's what might happens when your "screen" is effectively a unidimensional 40x1 character display. Fixed. Nicolas
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
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(-)