From 183e5dc5a18484cf37c2fdffa7b12a7ab8746558 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 30 Jan 2008 13:31:09 +0100
Subject: [PATCH] --- yaml --- r: 79952 b: refs/heads/master c:
 6b4b05bd790389962e6fcfc862562e7fa239c9d2 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-x86/page_32.h | 39 ++++++++++++++++++++++++++++-----
 trunk/include/asm-x86/page_64.h | 21 +++++++++++++-----
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ab42ceaae3d5..e2c9962b43ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b23be399da88a5008b1db4db06f03146b25cdc52
+refs/heads/master: 6b4b05bd790389962e6fcfc862562e7fa239c9d2
diff --git a/trunk/include/asm-x86/page_32.h b/trunk/include/asm-x86/page_32.h
index 80ecc66b6d86..c620c934e557 100644
--- a/trunk/include/asm-x86/page_32.h
+++ b/trunk/include/asm-x86/page_32.h
@@ -12,12 +12,21 @@
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
+#include <linux/string.h>
+
 #ifdef CONFIG_X86_USE_3DNOW
 
 #include <asm/mmx.h>
 
-#define clear_page(page)	mmx_clear_page((void *)(page))
-#define copy_page(to,from)	mmx_copy_page(to,from)
+static inline void clear_page(void *page)
+{
+	mmx_clear_page(page);
+}
+
+static inline void copy_page(void *to, void *from)
+{
+	mmx_copy_page(to, from);
+}
 
 #else
 
@@ -26,13 +35,31 @@
  *	Maybe the K6-III ?
  */
  
-#define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)
-#define copy_page(to,from)	memcpy((void *)(to), (void *)(from), PAGE_SIZE)
+static inline void clear_page(void *page)
+{
+	memset(page, 0, PAGE_SIZE);
+}
+
+static inline void copy_page(void *to, void *from)
+{
+	memcpy(to, from, PAGE_SIZE);
+}
 
 #endif
 
-#define clear_user_page(page, vaddr, pg)	clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)
+struct page;
+
+static void inline clear_user_page(void *page, unsigned long vaddr,
+				struct page *pg)
+{
+	clear_page(page);
+}
+
+static void inline copy_user_page(void *to, void *from, unsigned long vaddr,
+				struct page *topage)
+{
+	copy_page(to, from);
+}
 
 #define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
 	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
diff --git a/trunk/include/asm-x86/page_64.h b/trunk/include/asm-x86/page_64.h
index d400167c5509..068b5e4cea4c 100644
--- a/trunk/include/asm-x86/page_64.h
+++ b/trunk/include/asm-x86/page_64.h
@@ -43,11 +43,22 @@
 extern unsigned long end_pfn;
 extern unsigned long end_pfn_map;
 
-void clear_page(void *);
-void copy_page(void *, void *);
-
-#define clear_user_page(page, vaddr, pg)	clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)
+void clear_page(void *page);
+void copy_page(void *to, void *from);
+
+struct page;
+
+static void inline clear_user_page(void *page, unsigned long vaddr,
+				struct page *pg)
+{
+	clear_page(page);
+}
+
+static void inline copy_user_page(void *to, void *from, unsigned long vaddr,
+				struct page *topage)
+{
+	copy_page(to, from);
+}
 
 #define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
 	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)