lkml.org 
[lkml]   [2010]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:core/memblock] memblock, microblaze: Fix memblock API change fallout
    Commit-ID:  78cf195c41a69521f4b3e3fd8b8bd4ecbfcdac85
    Gitweb: http://git.kernel.org/tip/78cf195c41a69521f4b3e3fd8b8bd4ecbfcdac85
    Author: Yinghai Lu <yinghai@kernel.org>
    AuthorDate: Sat, 11 Sep 2010 00:07:06 -0700
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Sat, 11 Sep 2010 09:26:43 +0200

    memblock, microblaze: Fix memblock API change fallout

    Michal Simek reported this build failure:

    CC arch/microblaze/mm/init.o
    arch/microblaze/mm/init.c: In function 'mm_cmdline_setup':
    arch/microblaze/mm/init.c:236: error: 'struct memblock_type' has no member named 'region'
    ...

    Adopt Microblaze to the memblock API changes.

    Reported-by: Michal Simek <monstr@monstr.eu>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: linux-mm@kvack.org
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    LKML-Reference: <4C8B2A9A.1040303@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/microblaze/mm/init.c | 10 +++++-----
    1 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
    index 840026c..c843786 100644
    --- a/arch/microblaze/mm/init.c
    +++ b/arch/microblaze/mm/init.c
    @@ -228,7 +228,7 @@ static void mm_cmdline_setup(void)
    if (maxmem && memory_size > maxmem) {
    memory_size = maxmem;
    memory_end = memory_start + memory_size;
    - memblock.memory.region[0].size = memory_size;
    + memblock.memory.regions[0].size = memory_size;
    }
    }
    }
    @@ -271,14 +271,14 @@ asmlinkage void __init mmu_init(void)
    machine_restart(NULL);
    }

    - if ((u32) memblock.memory.region[0].size < 0x1000000) {
    + if ((u32) memblock.memory.regions[0].size < 0x1000000) {
    printk(KERN_EMERG "Memory must be greater than 16MB\n");
    machine_restart(NULL);
    }
    /* Find main memory where the kernel is */
    - memory_start = (u32) memblock.memory.region[0].base;
    - memory_end = (u32) memblock.memory.region[0].base +
    - (u32) memblock.memory.region[0].size;
    + memory_start = (u32) memblock.memory.regions[0].base;
    + memory_end = (u32) memblock.memory.regions[0].base +
    + (u32) memblock.memory.regions[0].size;
    memory_size = memory_end - memory_start;

    mm_cmdline_setup(); /* FIXME parse args from command line - not used */

    \
     
     \ /
      Last update: 2010-09-11 09:37    [W:0.027 / U:0.548 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site