From: Yinghai Lu <yhlu.kernel@gmail.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: get max_pfn_mapped in init_memory_mapping
Date: Tue, 24 Jun 2008 14:56:20 -0700 [thread overview]
Message-ID: <200806241456.20753.yhlu.kernel@gmail.com> (raw)
In-Reply-To: <200806241455.33199.yhlu.kernel@gmail.com>
so don't shift that in the loop
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 0c92624..8bad202 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -398,7 +398,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end)
__flush_tlb_all();
update_page_count(PG_LEVEL_1G, pages);
- return last_map_addr >> PAGE_SHIFT;
+ return last_map_addr;
}
static void __init find_early_table_space(unsigned long end)
@@ -606,7 +606,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, unsigned lon
if (!after_bootmem)
early_memtest(start_phys, end_phys);
- return last_map_addr;
+ return last_map_addr >> PAGE_SHIFT;
}
#ifndef CONFIG_NUMA
next prev parent reply other threads:[~2008-06-24 21:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-24 21:55 [PATCH] x86: fix e820_update_range size when overlapping Yinghai Lu
2008-06-24 21:56 ` Yinghai Lu [this message]
2008-06-24 21:57 ` [PATCH] x86: add table_top check for alloc_low_page in 64 bit Yinghai Lu
2008-06-24 21:58 ` [PATCH] x86: change size if e820_update/remove_range Yinghai Lu
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=200806241456.20753.yhlu.kernel@gmail.com \
--to=yhlu.kernel@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.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