summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@in.ibm.com>2007-01-11 01:52:44 +0100
committerAndi Kleen <andi@basil.nowhere.org>2007-01-11 01:52:44 +0100
commit0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e (patch)
tree067a5f16e9a2b02f88dd90d1899bc0f03985a77b
parentb92cc55923898ab5e8a78939be9734ab9e1c8f49 (diff)
downloadlinux-0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e.tar.gz
linux-0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e.tar.bz2
linux-0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e.zip
[PATCH] i386: Fix memory hotplug related MODPOST generated warning
o Fix modpost generated warning. WARNING: vmlinux - Section mismatch: reference to .init.text: from .text between 'add_one_highpage_hotplug' (at offset 0xc0113d3f) and 'online_page' Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r--arch/i386/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 60a7e57af197..c5c5ea700cc7 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -283,7 +283,7 @@ void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
SetPageReserved(page);
}
-static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
+static int __meminit add_one_highpage_hotplug(struct page *page, unsigned long pfn)
{
free_new_highpage(page);
totalram_pages++;
@@ -300,7 +300,7 @@ static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
* has been added dynamically that would be
* onlined here is in HIGHMEM
*/
-void online_page(struct page *page)
+void __meminit online_page(struct page *page)
{
ClearPageReserved(page);
add_one_highpage_hotplug(page, page_to_pfn(page));