Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753446AbcLKNBp (ORCPT ); Sun, 11 Dec 2016 08:01:45 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36485 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752829AbcLKNBn (ORCPT ); Sun, 11 Dec 2016 08:01:43 -0500 From: Wei Yang To: trivial@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH 1/2] mm/memblock.c: trivial code refine in memblock_is_region_memory() Date: Sun, 11 Dec 2016 12:59:49 +0000 Message-Id: <1481461190-11780-2-git-send-email-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1481461190-11780-1-git-send-email-richard.weiyang@gmail.com> References: <1481461190-11780-1-git-send-email-richard.weiyang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1411 Lines: 42 The base address is already guaranteed to be in the region by memblock_search(). This patch removes the check on base, also a little refine in a macro. Signed-off-by: Wei Yang --- include/linux/memblock.h | 5 ++--- mm/memblock.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 3106ac1..e611819 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -408,9 +408,8 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo region++) #define for_each_memblock_type(memblock_type, rgn) \ - idx = 0; \ - rgn = &memblock_type->regions[idx]; \ - for (idx = 0; idx < memblock_type->cnt; \ + for (idx = 0, rgn = &memblock_type->regions[idx]; \ + idx < memblock_type->cnt; \ idx++,rgn = &memblock_type->regions[idx]) #ifdef CONFIG_MEMTEST diff --git a/mm/memblock.c b/mm/memblock.c index ac12489..9d402d05 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1557,7 +1557,7 @@ int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size if (idx == -1) return 0; - return memblock.memory.regions[idx].base <= base && + return /* memblock.memory.regions[idx].base <= base && */ (memblock.memory.regions[idx].base + memblock.memory.regions[idx].size) >= end; } -- 1.7.9.5