From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752003AbeCNOlA (ORCPT ); Wed, 14 Mar 2018 10:41:00 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:44415 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751394AbeCNOk6 (ORCPT ); Wed, 14 Mar 2018 10:40:58 -0400 From: Arnd Bergmann To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Andrew Morton , Pavel Tatashin , Michal Hocko , Vlastimil Babka , Mel Gorman , Johannes Weiner , Tetsuo Handa , "Kirill A. Shutemov" , Ingo Molnar , Petr Tesarik , Dave Hansen , Wei Yang , linux-mm@kvack.org Subject: [PATCH 10/16] mm: remove obsolete alloc_remap() Date: Wed, 14 Mar 2018 15:39:09 +0100 Message-Id: <20180314143958.1548568-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180314143529.1456168-1-arnd@arndb.de> References: <20180314143529.1456168-1-arnd@arndb.de> X-Provags-ID: V03:K0:/HnUiaZVpLAgW1ppzzqZltZzmypjlxCbHC0YZv20X8L3fDuaAWS r1bXegLSOMkPJlNx862xLqa7NSv6EvEYpDD2/I+vs6zabzMOQobNZbWYrQDenk+GcJdcRJc mbc/TxIn2yDI+l0Vh4bvZ2nEZ5pkplgvmGlYOnNiO+x1TX9szrSsg8ZkOrXhiD8Ne1Qz+6N CC2zuZ+nPfQJtg1soIsKQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:nfp/Hj6cmLg=:lYqn2SnYt+DGguBMQNinG/ hdQF8RF7lUZuOnehkJf5KPSmgqAyWuPbarUpgJ++XxyeQzt4FdeuJwKE1O7g1gm5nFIjlVDxI ed0+Aco2wLNlk3QRDdog1I2LEkCMwyea5dEW7svSQTsO5qUVCTyuTGDRTsPIpfknZ0CPhpXVl M7Lbhq+3LH4vvddb5YMwYdHBZQ5ltIuewH4uFZUbpff9Jz0F1dZYDixk4MqhUGQk61EF2Xl9L 9Oz9H3buoWkj8QvSxPWyeWpoVDIkwaoP5Sd8/ZIQgODFGwlUV343BBXm1OFqyk/ABtXKPB5zY SzQd4xlGQlyxPyk3t4Tz8GIpaIpfZLlSNxzb34bSm2voGvvzGtB++tXLXC36mvpOLHw6If2Ru WQOgtwnc4zBOdGQmSOSXsYbOuQwwwvfWpkpIHB2+7lPPP1FfA78vVZwa7x8VfSvRsuEuxdxTg fNPGuZsU9dbz6SPhmLrBCvRw11OyKJYqmyQjaGo3wR8/NbgDpBEc4UOahxzQ//13iBoRH30Sw 71rwRZjifBN4n5GzIdurm2diNpo0gQKp/PNj93SfUXP1TCsctOOCQnj7qkrChl+rQ5i+bIV9h 7i+Zg+UXkXDYn3Sy/RYrEXY7AXNlPpcMfLEFuaQ8LiMgfYLmVrn2HCk0EnFxXa6QgLQP7KaKY s1SB9fpPk6NOhg5p5pPNQImNJS2W22w/YB2sWW6vvh6gLfrb0SQn0oPw8N56bCVNEnBUNmzQR F+Y4tRWyVX9zuEFu7lhKgMqxFRGXZ4VnVmx2tA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tile was the only remaining architecture to implement alloc_remap(), and since that is being removed, there is no point in keeping this function. Removing all callers simplifies the mem_map handling. Signed-off-by: Arnd Bergmann --- include/linux/bootmem.h | 9 --------- mm/page_alloc.c | 5 +---- mm/sparse.c | 15 --------------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index a53063e9d7d8..7942a96b1a9d 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h @@ -364,15 +364,6 @@ static inline void __init memblock_free_late( } #endif /* defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) */ -#ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP -extern void *alloc_remap(int nid, unsigned long size); -#else -static inline void *alloc_remap(int nid, unsigned long size) -{ - return NULL; -} -#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */ - extern void *alloc_large_system_hash(const char *tablename, unsigned long bucketsize, unsigned long numentries, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cb416723538f..484e21062228 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6199,10 +6199,7 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat) end = pgdat_end_pfn(pgdat); end = ALIGN(end, MAX_ORDER_NR_PAGES); size = (end - start) * sizeof(struct page); - map = alloc_remap(pgdat->node_id, size); - if (!map) - map = memblock_virt_alloc_node_nopanic(size, - pgdat->node_id); + map = memblock_virt_alloc_node_nopanic(size, pgdat->node_id); pgdat->node_mem_map = map + offset; } pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n", diff --git a/mm/sparse.c b/mm/sparse.c index 7af5e7a92528..65bb52599f90 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -427,10 +427,6 @@ struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid, struct page *map; unsigned long size; - map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION); - if (map) - return map; - size = PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); map = memblock_virt_alloc_try_nid(size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS), @@ -446,17 +442,6 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, unsigned long pnum; unsigned long size = sizeof(struct page) * PAGES_PER_SECTION; - map = alloc_remap(nodeid, size * map_count); - if (map) { - for (pnum = pnum_begin; pnum < pnum_end; pnum++) { - if (!present_section_nr(pnum)) - continue; - map_map[pnum] = map; - map += size; - } - return; - } - size = PAGE_ALIGN(size); map = memblock_virt_alloc_try_nid_raw(size * map_count, PAGE_SIZE, __pa(MAX_DMA_ADDRESS), -- 2.9.0