Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751695AbcDRIL3 (ORCPT ); Mon, 18 Apr 2016 04:11:29 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:38252 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbcDRIL1 (ORCPT ); Mon, 18 Apr 2016 04:11:27 -0400 MIME-Version: 1.0 In-Reply-To: <1460920476-14320-1-git-send-email-kuleshovmail@gmail.com> References: <1460920476-14320-1-git-send-email-kuleshovmail@gmail.com> Date: Mon, 18 Apr 2016 10:11:26 +0200 Message-ID: Subject: Re: [PATCH] mm/memblock: move memblock_{add,reserve}_region into memblock_{add,reserve} From: Ard Biesheuvel To: Alexander Kuleshov Cc: Andrew Morton , Mel Gorman , Pekka Enberg , Tony Luck , Tang Chen , David Gibson , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3389 Lines: 82 On 17 April 2016 at 21:14, Alexander Kuleshov wrote: > From: 0xAX > > The memblock_add_region() and memblock_reserve_region do not nothing specific > before the call of the memblock_add_range(), only print debug output. > > We can do the same in the memblock_add() and memblock_reserve() since both > memblock_add_region() and memblock_reserve_region are not used by anybody > outside of memblock.c and the memblock_{add,reserve}() have the same set of > flags and nids. > > Since the memblock_add_region() and memblock_reserve_region() anyway will be > inlined, there will not be functional changes, but will improve code readability > a little. > > Signed-off-by: Alexander Kuleshov Acked-by: Ard Biesheuvel > --- > mm/memblock.c | 28 ++++++---------------------- > 1 file changed, 6 insertions(+), 22 deletions(-) > > diff --git a/mm/memblock.c b/mm/memblock.c > index b570ddd..3b93daa 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -606,22 +606,14 @@ int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size, > return memblock_add_range(&memblock.memory, base, size, nid, 0); > } > > -static int __init_memblock memblock_add_region(phys_addr_t base, > - phys_addr_t size, > - int nid, > - unsigned long flags) > +int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) > { > memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n", > (unsigned long long)base, > (unsigned long long)base + size - 1, > - flags, (void *)_RET_IP_); > - > - return memblock_add_range(&memblock.memory, base, size, nid, flags); > -} > + 0UL, (void *)_RET_IP_); > > -int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) > -{ > - return memblock_add_region(base, size, MAX_NUMNODES, 0); > + return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0); > } > > /** > @@ -732,22 +724,14 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) > return memblock_remove_range(&memblock.reserved, base, size); > } > > -static int __init_memblock memblock_reserve_region(phys_addr_t base, > - phys_addr_t size, > - int nid, > - unsigned long flags) > +int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) > { > memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n", > (unsigned long long)base, > (unsigned long long)base + size - 1, > - flags, (void *)_RET_IP_); > - > - return memblock_add_range(&memblock.reserved, base, size, nid, flags); > -} > + 0UL, (void *)_RET_IP_); > > -int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) > -{ > - return memblock_reserve_region(base, size, MAX_NUMNODES, 0); > + return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0); > } > > /** > -- > 2.8.0.rc3.212.g1f992f2.dirty >