Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756249Ab2ENL6M (ORCPT ); Mon, 14 May 2012 07:58:12 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:34157 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755681Ab2ENL6K (ORCPT ); Mon, 14 May 2012 07:58:10 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.4.0 Message-ID: <4FB0F36C.4010906@jp.fujitsu.com> Date: Mon, 14 May 2012 20:58:36 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Lai Jiangshan CC: Mel Gorman , Andrew Morton , linux-mm@kvack.org, LKML Subject: [Patch 2/4] x86: use memblock_set_current_limit() to set memblock.current_limit References: <4FACA79C.9070103@cn.fujitsu.com> <4FB0F174.1000400@jp.fujitsu.com> In-Reply-To: <4FB0F174.1000400@jp.fujitsu.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1265 Lines: 36 memblock.current_limit is set directly though memblock_set_current_limit() is prepared. So fix it. Signed-off-by: Yasuaki Ishimatsu --- arch/x86/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-3.4-rc6/arch/x86/kernel/setup.c =================================================================== --- linux-3.4-rc6.orig/arch/x86/kernel/setup.c 2012-05-15 04:43:11.862313172 +0900 +++ linux-3.4-rc6/arch/x86/kernel/setup.c 2012-05-15 06:44:53.504030089 +0900 @@ -897,7 +897,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(); /* @@ -933,7 +933,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()); /* * NOTE: On x86-32, only from this point on, fixmaps are ready for use. -- 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/