commit 0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e

Author: Vivek Goyal <vgoyal@in.ibm.com>
Date:   Thu Jan 11 01:52:44 2007 +0100

    [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>

diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 89e8486aac3499f3f39b35f5268df100b95285ad..5826718692c19abfac50460097e4f36e1c99d8e0 100644 (file)
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -285,7 +285,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++;
@@ -302,7 +302,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));