It's a real PITA to have to search for it in the middle Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> --- lib/lmb.c | 54 +++++++++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/lmb.c b/lib/lmb.c index 9fd0145..141d4ab 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -107,33 +107,6 @@ static void lmb_coalesce_regions(struct lmb_type *type, lmb_remove_region(type, r2); } -void __init lmb_init(void) -{ - /* Hookup the initial arrays */ - lmb.memory.regions = lmb_memory_init_regions; - lmb.memory.max = INIT_LMB_REGIONS; - lmb.reserved.regions = lmb_reserved_init_regions; - lmb.reserved.max = INIT_LMB_REGIONS; - - /* Write a marker in the unused last array entry */ - lmb.memory.regions[INIT_LMB_REGIONS].base = (phys_addr_t)RED_INACTIVE; - lmb.reserved.regions[INIT_LMB_REGIONS].base = (phys_addr_t)RED_INACTIVE; - - /* Create a dummy zero size LMB which will get coalesced away later. - * This simplifies the lmb_add() code below... - */ - lmb.memory.regions[0].base = 0; - lmb.memory.regions[0].size = 0; - lmb.memory.cnt = 1; - - /* Ditto. */ - lmb.reserved.regions[0].base = 0; - lmb.reserved.regions[0].size = 0; - lmb.reserved.cnt = 1; - - lmb.current_limit = LMB_ALLOC_ANYWHERE; -} - void __init lmb_analyze(void) { int i; @@ -517,3 +490,30 @@ void __init lmb_set_current_limit(phys_addr_t limit) lmb.current_limit = limit; } +void __init lmb_init(void) +{ + /* Hookup the initial arrays */ + lmb.memory.regions = lmb_memory_init_regions; + lmb.memory.max = INIT_LMB_REGIONS; + lmb.reserved.regions = lmb_reserved_init_regions; + lmb.reserved.max = INIT_LMB_REGIONS; + + /* Write a marker in the unused last array entry */ + lmb.memory.regions[INIT_LMB_REGIONS].base = (phys_addr_t)RED_INACTIVE; + lmb.reserved.regions[INIT_LMB_REGIONS].base = (phys_addr_t)RED_INACTIVE; + + /* Create a dummy zero size LMB which will get coalesced away later. + * This simplifies the lmb_add() code below... + */ + lmb.memory.regions[0].base = 0; + lmb.memory.regions[0].size = 0; + lmb.memory.cnt = 1; + + /* Ditto. */ + lmb.reserved.regions[0].base = 0; + lmb.reserved.regions[0].size = 0; + lmb.reserved.cnt = 1; + + lmb.current_limit = LMB_ALLOC_ANYWHERE; +} + -- 1.6.3.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>