---

 memhotplug-dave/arch/i386/kernel/sysenter.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -puN arch/i386/kernel/sysenter.c~sysenter-types arch/i386/kernel/sysenter.c
--- memhotplug/arch/i386/kernel/sysenter.c~sysenter-types	2004-08-23 10:38:24.000000000 -0700
+++ memhotplug-dave/arch/i386/kernel/sysenter.c	2004-08-23 10:38:24.000000000 -0700
@@ -43,18 +43,18 @@ extern const char vsyscall_sysenter_star
 
 static int __init sysenter_setup(void)
 {
-	unsigned long page = get_zeroed_page(GFP_ATOMIC);
+	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
 
 	__set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);
 
 	if (!boot_cpu_has(X86_FEATURE_SEP)) {
-		memcpy((void *) page,
+		memcpy(page,
 		       &vsyscall_int80_start,
 		       &vsyscall_int80_end - &vsyscall_int80_start);
 		return 0;
 	}
 
-	memcpy((void *) page,
+	memcpy(page,
 	       &vsyscall_sysenter_start,
 	       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
 
_