Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759922Ab0GVS2o (ORCPT ); Thu, 22 Jul 2010 14:28:44 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:42194 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755134Ab0GVSW1 (ORCPT ); Thu, 22 Jul 2010 14:22:27 -0400 From: Yinghai Lu To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt , Linus Torvalds Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Subject: [PATCH 26/31] memblock: Prepare x86 to use memblock to replace early_res Date: Thu, 22 Jul 2010 11:20:59 -0700 Message-Id: <1279822864-17154-27-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1279822864-17154-1-git-send-email-yinghai@kernel.org> References: <1279822864-17154-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsmt353.oracle.com [141.146.40.153] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090208.4C488C3B.01E6,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1923 Lines: 57 1. expose memblock_debug 2. expose memblock_reserved_init_regions -v2: drop memblock_add_region() and MEMBLOCK_ERROR export -v3: seperate wrong return of memblock_fin_base to another patch -v4: expose memblock_can_resize to handle x86 EFI that could have more than 128 entries -v5: add memblock_dbg, so we can spare some if (memblock_debug) suggested by Ingo. Signed-off-by: Yinghai Lu --- include/linux/memblock.h | 6 ++++++ mm/memblock.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 08a12cf..70bc467 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -39,6 +39,12 @@ struct memblock { }; extern struct memblock memblock; +extern int memblock_debug; +extern int memblock_can_resize; +extern struct memblock_region memblock_reserved_init_regions[]; + +#define memblock_dbg(fmt, ...) \ + if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) extern void __init memblock_init(void); extern void __init memblock_analyze(void); diff --git a/mm/memblock.c b/mm/memblock.c index b5eb901..c16d4c6 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -22,9 +22,10 @@ struct memblock memblock; -static int memblock_debug, memblock_can_resize; +int memblock_debug; +int memblock_can_resize; static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1]; -static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1]; +struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1]; #define MEMBLOCK_ERROR (~(phys_addr_t)0) -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/