LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: David Miller <davem@davemloft.net>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 05/11] x86: Change get_max_mapped() to inline
Date: Mon,  7 Feb 2011 15:17:06 -0800	[thread overview]
Message-ID: <1297120632-24933-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1297120632-24933-1-git-send-email-yinghai@kernel.org>

Move it into head file. to prepare use it in other files.

-v2: hpa pointed out that u64 should not be used here.
     Actually We could unsigned long here. because for 32bit it will under 4g.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 arch/x86/include/asm/page_types.h |    5 +++++
 arch/x86/kernel/setup.c           |    9 ---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 1df6621..cf271fd 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -45,6 +45,11 @@ extern int devmem_is_allowed(unsigned long pagenr);
 extern unsigned long max_low_pfn_mapped;
 extern unsigned long max_pfn_mapped;
 
+static inline unsigned long get_max_mapped(void)
+{
+	return max_pfn_mapped<<PAGE_SHIFT;
+}
+
 extern unsigned long init_memory_mapping(unsigned long start,
 					 unsigned long end);
 
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d3cfe26..23a7a5f 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -680,15 +680,6 @@ static int __init parse_reservelow(char *p)
 
 early_param("reservelow", parse_reservelow);
 
-static u64 __init get_max_mapped(void)
-{
-	u64 end = max_pfn_mapped;
-
-	end <<= PAGE_SHIFT;
-
-	return end;
-}
-
 /*
  * Determine if we were loaded by an EFI loader.  If so, then we have also been
  * passed the efi memmap, systab, etc., so we should use these data structures
-- 
1.7.1


  parent reply	other threads:[~2011-02-07 23:52 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-07 23:17 [PATCH -v2 0/11] x86: memblock related cleanup Yinghai Lu
2011-02-07 23:17 ` [PATCH 01/11] memblock: Don't adjust size in memblock_find_base() Yinghai Lu
2011-02-07 23:17 ` [PATCH 02/11] x86, mm, 64bit: Put early page table high Yinghai Lu
2011-02-07 23:17 ` [PATCH 03/11] x86, 64bit, gart: Fix allocation with memblock Yinghai Lu
2011-02-07 23:17 ` [PATCH 04/11] memblock: Make find_memory_core_early() find from top-down Yinghai Lu
2011-02-07 23:17 ` Yinghai Lu [this message]
2011-02-07 23:17 ` [PATCH 06/11] x86, 64bit, numa: Allocate memnodemap under max_pfn_mapped Yinghai Lu
2011-02-07 23:17 ` [PATCH 07/11] x86, 64bit, numa: Put pgtable to local node memory Yinghai Lu
2011-02-07 23:17 ` [PATCH 08/11] x86: Rename e820_table_* to pgt_buf_* Yinghai Lu
2011-02-07 23:17 ` [PATCH 09/11] bootmem: Add nobootmem.c to reduce the #ifdef Yinghai Lu
2011-02-07 23:17 ` [PATCH 10/11] mm: Move contig_page_data define to bootmem.c/nobootmem.c Yinghai Lu
2011-02-22 23:48   ` Andrew Morton
2011-02-24  7:11     ` [PATCH 0/3] mm: Split bootmem.c for nobootmem support Yinghai Lu
     [not found]     ` <4D660375.10005@kernel.org>
2011-02-24  7:11       ` [PATCH 1/3] bootmem: Add nobootmem.c to reduce the #ifdef Yinghai Lu
2011-02-24 13:57         ` [PATCH] bootmem: Separate out CONFIG_NO_BOOTMEM code into nobootmem.c Tejun Heo
2011-02-24  7:12       ` [PATCH 2/3] mm: Move contig_page_data define to bootmem.c/nobootmem.c Yinghai Lu
2011-02-24 13:58         ` [PATCH] bootmem: Move contig_page_data definition " Tejun Heo
2011-02-24  7:12       ` [PATCH 3/3] memblock: Move __alloc_memory_core_early() to nobootmem.c Yinghai Lu
2011-02-24 13:59         ` [PATCH] bootmem: " Tejun Heo
2011-02-07 23:17 ` [PATCH 11/11] memblock: " Yinghai Lu
2011-02-15  6:37 ` [PATCH -v2 0/11] x86: memblock related cleanup 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=1297120632-24933-6-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=benh@kernel.crashing.org \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH 05/11] x86: Change get_max_mapped() to inline' \
    /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

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).