public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
To: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-mm@kvack.org, LKML <linux-kernel@vger.kernel.org>
Subject: [Patch 2/4] x86: use memblock_set_current_limit() to set memblock.current_limit
Date: Mon, 14 May 2012 20:58:36 +0900	[thread overview]
Message-ID: <4FB0F36C.4010906@jp.fujitsu.com> (raw)
In-Reply-To: <4FB0F174.1000400@jp.fujitsu.com>

memblock.current_limit is set directly though memblock_set_current_limit()
is prepared. So fix it.

Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
  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.


  parent reply	other threads:[~2012-05-14 11:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-11  5:46 [PATCH] memory: add kernelcore_max_addr boot option Lai Jiangshan
2012-05-11 20:39 ` Andrew Morton
2012-05-14  2:33   ` Yasuaki Ishimatsu
2012-05-14 11:50 ` Yasuaki Ishimatsu
2012-05-14 11:58   ` [Patch 1/4] x86: get pg_data_t's memory from other node Yasuaki Ishimatsu
2012-05-14 11:58   ` Yasuaki Ishimatsu [this message]
2012-05-14 11:58   ` [Patch 3/4] memblock: limit memory address from memblock Yasuaki Ishimatsu
2012-05-14 16:52     ` Sam Ravnborg
2012-05-14 11:59   ` [Patch 4/4] memblock: compare current_limit with end variable at memblock_find_in_range_node() Yasuaki Ishimatsu
2012-05-14 12:01   ` [PATCH] memory: add kernelcore_max_addr boot option Yasuaki Ishimatsu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4FB0F36C.4010906@jp.fujitsu.com \
    --to=isimatu.yasuaki@jp.fujitsu.com \
    --cc=akpm@linux-foundation.org \
    --cc=laijs@cn.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mgorman@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox