2006-12-19 05:17:37

by Vivek Goyal

[permalink] [raw]
Subject: [PATCH 5/5] 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 <[email protected]>
---

arch/i386/mm/init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/mm/init.c~i386-memory-hotplug-related-warnings arch/i386/mm/init.c
--- linux-2.6.19-rc1-reloc/arch/i386/mm/init.c~i386-memory-hotplug-related-warnings 2006-12-15 14:09:05.000000000 +0530
+++ linux-2.6.19-rc1-reloc-root/arch/i386/mm/init.c 2006-12-15 14:09:05.000000000 +0530
@@ -283,7 +283,7 @@ void __init add_one_highpage_init(struct
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(stru
* 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));
_