From: Andy Whitcroft <apw@shadowen.org>
To: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
Johannes Weiner <hannes@saeurebad.de>,
Andy Whitcroft <apw@shadowen.org>, linux-mm <linux-mm@kvack.org>
Subject: [PATCH 5/8] parisc: mem_map/max_mapnr -- definition is specific to FLATMEM
Date: Thu, 10 Apr 2008 11:41:18 +0100 [thread overview]
Message-ID: <1207824078.0@pinky> (raw)
In-Reply-To: 20080410103306.GA29831@shadowen.org
The max_mapnr variable is only used FLATMEM memory model, use the
appropriate defines.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
arch/parisc/mm/init.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 2c721e1..bd300d1 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -461,10 +461,11 @@ void __init mem_init(void)
high_memory = __va((max_pfn << PAGE_SHIFT));
-#ifndef CONFIG_DISCONTIGMEM
+#ifdef CONFIG_FLATMEM
max_mapnr = page_to_pfn(virt_to_page(high_memory - 1)) + 1;
totalram_pages += free_all_bootmem();
-#else
+#endif
+#ifdef CONFIG_DISCONTIGMEM
{
int i;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2008-04-10 10:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1207340609.26869.20.camel@nimitz.home.sr71.net>
2008-04-10 10:33 ` max_mapnr config option Andy Whitcroft
2008-04-10 10:40 ` [PATCH 1/8] alpha: mem_map/max_mapnr -- init is FLATMEM use correct defines Andy Whitcroft
2008-04-10 10:41 ` [PATCH 2/8] arm: " Andy Whitcroft
2008-04-10 10:41 ` [PATCH 3/8] m32r: mem_map/max_mapnr -- definition is specific to FLATMEM Andy Whitcroft
2008-04-10 10:41 ` [PATCH 4/8] mips: " Andy Whitcroft
2008-04-10 10:41 ` Andy Whitcroft [this message]
2008-04-10 10:41 ` [PATCH 6/8] powerpc: " Andy Whitcroft
2008-04-10 10:41 ` [PATCH 7/8] sparc64: " Andy Whitcroft
2008-04-10 10:41 ` [PATCH 8/8] mem_map/max_mapnr are specific to the FLATMEM memory model Andy Whitcroft
2008-06-02 15:13 ` Jeremy Fitzhardinge
[not found] ` <20080407091756.GC17915@shadowen.org>
[not found] ` <87iqyuhth2.fsf@saeurebad.de>
[not found] ` <20080408105137.GD17915@shadowen.org>
2008-05-23 13:09 ` max_mapnr config option apw
2008-05-23 19:52 ` Johannes Weiner
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=1207824078.0@pinky \
--to=apw@shadowen.org \
--cc=dave@linux.vnet.ibm.com \
--cc=hannes@saeurebad.de \
--cc=jeremy@goop.org \
--cc=linux-mm@kvack.org \
/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;
as well as URLs for NNTP newsgroup(s).