lkml.org 
[lkml]   [2011]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[31/53] ARM: 7204/1: arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier
    3.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnaud Patard <arnaud.patard@rtp-net.org>

    commit 9811ccdfa94b4773c8030569bd8ec75eafa485ac upstream.

    arm_dma_zone_size is used by arm_bootmem_free() which is called by
    paging_init(). Thus it needs to be set before calling it.

    Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
    Acked-by: Nicolas Pitre <nico@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/arm/kernel/setup.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/arch/arm/kernel/setup.c
    +++ b/arch/arm/kernel/setup.c
    @@ -890,6 +890,12 @@ void __init setup_arch(char **cmdline_p)
    machine_desc = mdesc;
    machine_name = mdesc->name;

    +#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
    if (mdesc->soft_reboot)
    reboot_setup("s");

    @@ -920,12 +926,6 @@ void __init setup_arch(char **cmdline_p)

    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



    \
     
     \ /
      Last update: 2011-12-16 20:55    [W:0.020 / U:0.564 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site