RE: [PATCH v2 17/38] common: Move initr_addr_map() to a bit earlier