Commit 6b4b05bd authored by Randy Dunlap's avatar Randy Dunlap Committed by Ingo Molnar

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b23be399
...@@ -12,12 +12,21 @@ ...@@ -12,12 +12,21 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/string.h>
#ifdef CONFIG_X86_USE_3DNOW #ifdef CONFIG_X86_USE_3DNOW
#include <asm/mmx.h> #include <asm/mmx.h>
#define clear_page(page) mmx_clear_page((void *)(page)) static inline void clear_page(void *page)
#define copy_page(to,from) mmx_copy_page(to,from) {
mmx_clear_page(page);
}
static inline void copy_page(void *to, void *from)
{
mmx_copy_page(to, from);
}
#else #else
...@@ -26,13 +35,31 @@ ...@@ -26,13 +35,31 @@
* Maybe the K6-III ? * Maybe the K6-III ?
*/ */
#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) static inline void clear_page(void *page)
#define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) {
memset(page, 0, PAGE_SIZE);
}
static inline void copy_page(void *to, void *from)
{
memcpy(to, from, PAGE_SIZE);
}
#endif #endif
#define clear_user_page(page, vaddr, pg) clear_page(page) struct page;
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
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) \ #define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
......
...@@ -43,11 +43,22 @@ ...@@ -43,11 +43,22 @@
extern unsigned long end_pfn; extern unsigned long end_pfn;
extern unsigned long end_pfn_map; extern unsigned long end_pfn_map;
void clear_page(void *); void clear_page(void *page);
void copy_page(void *, void *); void copy_page(void *to, void *from);
#define clear_user_page(page, vaddr, pg) clear_page(page) struct page;
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
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) \ #define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment