Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935285Ab2JaJQs (ORCPT ); Wed, 31 Oct 2012 05:16:48 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:57227 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S935161Ab2JaJQC (ORCPT ); Wed, 31 Oct 2012 05:16:02 -0400 X-IronPort-AV: E=Sophos;i="4.80,687,1344182400"; d="scan'208";a="6107688" From: Wen Congyang To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org Cc: Rob Landley , Andrew Morton , Yasuaki Ishimatsu , Lai Jiangshan , Jiang Liu , KOSAKI Motohiro , Minchan Kim , Mel Gorman , David Rientjes , Yinghai Lu , "rusty@rustcorp.com.au" Subject: [PART5 Patch 3/5] x86: use memblock_set_current_limit() to set memblock.current_limit Date: Wed, 31 Oct 2012 17:21:41 +0800 Message-Id: <1351675303-11786-4-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1351675303-11786-1-git-send-email-wency@cn.fujitsu.com> References: <1351675303-11786-1-git-send-email-wency@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/10/31 17:15:14, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/10/31 17:15:15, Serialize complete at 2012/10/31 17:15:15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1210 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 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index ca45696..ab3017a 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -890,7 +890,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(); /* @@ -940,7 +940,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.8.0 -- 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/