X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-m68k%2Fpage.h;h=6b7d6a040b49f05f053b6f17bfd2df886eb54a03;hb=5e3b93f248c98873cc843e83092bb8da92ac85a2;hp=3fa56008d979dbe70c735399bce568e727fac0ed;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h
index 3fa56008d..6b7d6a040 100644
--- a/include/asm-m68k/page.h
+++ b/include/asm-m68k/page.h
@@ -52,13 +52,15 @@ static inline void copy_page(void *to, void *from)
 
 static inline void clear_page(void *page)
 {
-	unsigned long tmp;
-	unsigned long *sp = page;
+	unsigned long data, tmp;
+	void *sp = page;
 
-	*sp++ = 0;
-	*sp++ = 0;
-	*sp++ = 0;
-	*sp++ = 0;
+	data = 0;
+
+	*((unsigned long *)(page))++ = 0;
+	*((unsigned long *)(page))++ = 0;
+	*((unsigned long *)(page))++ = 0;
+	*((unsigned long *)(page))++ = 0;
 
 	__asm__ __volatile__("1:\t"
 			     ".chip 68040\n\t"
@@ -67,8 +69,8 @@ static inline void clear_page(void *page)
 			     "subqw  #8,%2\n\t"
 			     "subqw  #8,%2\n\t"
 			     "dbra   %1,1b\n\t"
-			     : "=a" (sp), "=d" (tmp)
-			     : "a" (page), "0" (sp),
+			     : "=a" (page), "=d" (tmp)
+			     : "a" (sp), "0" (page),
 			       "1" ((PAGE_SIZE - 16) / 16 - 1));
 }
 
@@ -190,8 +192,6 @@ static inline void *__va(unsigned long x)
 #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#define devmem_is_allowed(x) 1
-
 #endif /* __KERNEL__ */
 
 #endif /* _M68K_PAGE_H */