[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-0c0f756fd679d9747d52dad51fce3a5bb362eec3@git.kernel.org>
Date: Thu, 5 Mar 2009 13:38:18 GMT
From: Pekka Enberg <penberg@...helsinki.fi>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, penberg@...helsinki.fi, tglx@...utronix.de,
mingo@...e.hu
Subject: [tip:x86/mm] x86: add stub init_gbpages() for 32-bit init_memory_mapping()
Commit-ID: 0c0f756fd679d9747d52dad51fce3a5bb362eec3
Gitweb: http://git.kernel.org/tip/0c0f756fd679d9747d52dad51fce3a5bb362eec3
Author: "Pekka Enberg" <penberg@...helsinki.fi>
AuthorDate: Thu, 5 Mar 2009 14:55:04 +0200
Commit: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 5 Mar 2009 14:17:16 +0100
x86: add stub init_gbpages() for 32-bit init_memory_mapping()
Impact: cleanup
This patch adds an empty static inline init_gbpages() for the 32-bit
version of init_memory_mapping() making both versions identical.
Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
Cc: Yinghai Lu <yinghai@...nel.org>
LKML-Reference: <1236257708-27269-13-git-send-email-penberg@...helsinki.fi>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/mm/init_32.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index f59e9b8..cd3c24b 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -922,6 +922,10 @@ static int save_mr(struct map_range *mr, int nr_range,
return nr_range;
}
+static inline void init_gbpages(void)
+{
+}
+
/*
* Setup the direct mapping of the physical memory at PAGE_OFFSET.
* This runs before bootmem is initialized and gets pages directly from
@@ -941,6 +945,9 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end);
+ if (!after_bootmem)
+ init_gbpages();
+
#ifdef CONFIG_DEBUG_PAGEALLOC
/*
* For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists