Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753786Ab2HBGBk (ORCPT ); Thu, 2 Aug 2012 02:01:40 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:37177 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753583Ab2HBGB2 (ORCPT ); Thu, 2 Aug 2012 02:01:28 -0400 X-IronPort-AV: E=Sophos;i="4.77,698,1336320000"; d="scan'208";a="5534641" From: Lai Jiangshan To: Mel Gorman , linux-kernel@vger.kernel.org Cc: Yasuaki Ishimatsu , Lai Jiangshan , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Jarkko Sakkinen , Matt Fleming , Andrew Morton Subject: [RFC PATCH 20/23 V2] x86: use memblock_set_current_limit() to set memblock.current_limit Date: Thu, 2 Aug 2012 14:01:25 +0800 Message-Id: <1343887288-8866-21-git-send-email-laijs@cn.fujitsu.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1343887288-8866-1-git-send-email-laijs@cn.fujitsu.com> References: <1343887288-8866-1-git-send-email-laijs@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/02 14:01:57, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/02 14:01:58, Serialize complete at 2012/08/02 14:01:58 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1214 Lines: 41 From: Yasuaki Ishimatsu memblock.current_limit is set directly though memblock_set_current_limit() is prepared. So fix it. Signed-off-by: Yasuaki Ishimatsu Signed-off-by: Lai Jiangshan --- arch/x86/kernel/setup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index f4b9b80..bb9d9f8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -889,7 +889,7 @@ void __init setup_arch(char **cmdline_p) cleanup_highmap(); - memblock.current_limit = get_max_mapped(); + memblock_set_current_limit(get_max_mapped()); memblock_x86_fill(); /* @@ -925,7 +925,7 @@ void __init setup_arch(char **cmdline_p) max_low_pfn = max_pfn; } #endif - memblock.current_limit = get_max_mapped(); + memblock_set_current_limit(get_max_mapped()); dma_contiguous_reserve(0); /* -- 1.7.1 -- 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/