diff options
Diffstat (limited to 'include/asm-x86/page_32.h')
| -rw-r--r-- | include/asm-x86/page_32.h | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index 80ecc66b6d8..c620c934e55 100644 --- a/include/asm-x86/page_32.h +++ b/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) |