From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 12 Aug 2005 19:49:23 +0000 (+0000)
Subject: fix arch_free_page() prototype
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~163
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1d62a976ec987574b293e238bd8d8fdeb887e913;p=linux-2.6.git

fix arch_free_page() prototype
---

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index 420e6d51f..5c1a77f0c 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -225,7 +225,7 @@ EXPORT_SYMBOL(physmem_forget_descriptor);
 EXPORT_SYMBOL(physmem_remove_mapping);
 EXPORT_SYMBOL(physmem_subst_mapping);
 
-void arch_free_page(struct page *page, int order)
+int arch_free_page(struct page *page, int order)
 {
 	void *virt;
 	int i;
@@ -234,6 +234,8 @@ void arch_free_page(struct page *page, int order)
 		virt = __va(page_to_phys(page + i));
 		physmem_remove_mapping(virt);
 	}
+
+	return 0;
 }
 
 int is_remapped(void *virt)
diff --git a/include/asm-um/page.h b/include/asm-um/page.h
index ccf78ef9b..ac83c0bb7 100644
--- a/include/asm-um/page.h
+++ b/include/asm-um/page.h
@@ -134,7 +134,7 @@ extern struct page *arch_validate(struct page *page, int mask, int order);
 #define HAVE_ARCH_VALIDATE
 #define devmem_is_allowed(x) 1
 
-extern void arch_free_page(struct page *page, int order);
+extern int arch_free_page(struct page *page, int order);
 #define HAVE_ARCH_FREE_PAGE
 
 #endif