From 6b4b05bd790389962e6fcfc862562e7fa239c9d2 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Wed, 30 Jan 2008 13:31:09 +0100 Subject: [PATCH] x64/page.h: convert some macros to inlines Convert clear_page/copy_page macros to inline functions for type-checking. Andrew wants to extirpate these ugly macros. (Ingo too. Thomas as well. Please send us more "kill ugly macros" patches! :-) Signed-off-by: Randy Dunlap Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- include/asm-x86/page_32.h | 39 +++++++++++++++++++++++++++++++++------ include/asm-x86/page_64.h | 21 ++++++++++++++++----- 2 files changed, 49 insertions(+), 11 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 + #ifdef CONFIG_X86_USE_3DNOW #include -#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/include/asm-x86/page_64.h b/include/asm-x86/page_64.h index d400167c550..068b5e4cea4 100644 --- a/include/asm-x86/page_64.h +++ b/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) -- 2.41.1