diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-06 15:39:10 -0700 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 12:56:17 +1000 |
| commit | 7590abe891c85fbc65dc906516d0bf89e070c19a (patch) | |
| tree | 4c522633ca9fb4ba1527bc20d049199a30922b44 /mm/memblock.c | |
| parent | 4d629f9a02e32f8fe035a11018472ea8ff9647eb (diff) | |
| download | lwn-7590abe891c85fbc65dc906516d0bf89e070c19a.tar.gz lwn-7590abe891c85fbc65dc906516d0bf89e070c19a.zip | |
memblock: Move memblock_init() to the bottom of the file
It's a real PITA to have to search for it in the middle
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index fc7f97b2d994..ae856d4e25a3 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -107,33 +107,6 @@ static void memblock_coalesce_regions(struct memblock_type *type, memblock_remove_region(type, r2); } -void __init memblock_init(void) -{ - /* Hookup the initial arrays */ - memblock.memory.regions = memblock_memory_init_regions; - memblock.memory.max = INIT_MEMBLOCK_REGIONS; - memblock.reserved.regions = memblock_reserved_init_regions; - memblock.reserved.max = INIT_MEMBLOCK_REGIONS; - - /* Write a marker in the unused last array entry */ - memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE; - memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE; - - /* Create a dummy zero size MEMBLOCK which will get coalesced away later. - * This simplifies the memblock_add() code below... - */ - memblock.memory.regions[0].base = 0; - memblock.memory.regions[0].size = 0; - memblock.memory.cnt = 1; - - /* Ditto. */ - memblock.reserved.regions[0].base = 0; - memblock.reserved.regions[0].size = 0; - memblock.reserved.cnt = 1; - - memblock.current_limit = MEMBLOCK_ALLOC_ANYWHERE; -} - void __init memblock_analyze(void) { int i; @@ -543,3 +516,30 @@ void __init memblock_set_current_limit(phys_addr_t limit) memblock.current_limit = limit; } +void __init memblock_init(void) +{ + /* Hookup the initial arrays */ + memblock.memory.regions = memblock_memory_init_regions; + memblock.memory.max = INIT_MEMBLOCK_REGIONS; + memblock.reserved.regions = memblock_reserved_init_regions; + memblock.reserved.max = INIT_MEMBLOCK_REGIONS; + + /* Write a marker in the unused last array entry */ + memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE; + memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE; + + /* Create a dummy zero size MEMBLOCK which will get coalesced away later. + * This simplifies the memblock_add() code below... + */ + memblock.memory.regions[0].base = 0; + memblock.memory.regions[0].size = 0; + memblock.memory.cnt = 1; + + /* Ditto. */ + memblock.reserved.regions[0].base = 0; + memblock.reserved.regions[0].size = 0; + memblock.reserved.cnt = 1; + + memblock.current_limit = MEMBLOCK_ALLOC_ANYWHERE; +} + |