patch-2.4.0-test9 linux/include/asm-sh/page.h

Next file: linux/include/asm-sh/pci.h
Previous file: linux/include/asm-sh/irq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-sh/page.h linux/include/asm-sh/page.h
@@ -9,7 +9,7 @@
    [ P0/U0 (virtual) ]		0x00000000     <------ User space
    [ P1 (fixed)   cached ]	0x80000000     <------ Kernel space
    [ P2 (fixed)  non-cachable]	0xA0000000     <------ Physical access
-   [ P3 (virtual) cached]	0xC0000000     <------ not used
+   [ P3 (virtual) cached]	0xC0000000     <------ vmalloced area
    [ P4 control   ]		0xE0000000
  */
 
@@ -26,8 +26,14 @@
 
 #define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)
 #define copy_page(to,from)	memcpy((void *)(to), (void *)(from), PAGE_SIZE)
+
+#if defined(__sh3__)
 #define clear_user_page(page, vaddr)	clear_page(page)
 #define copy_user_page(to, from, vaddr)	copy_page(to, from)
+#elif defined(__SH4__)
+extern void clear_user_page(void *to, unsigned long address);
+extern void copy_user_page(void *to, void *from, unsigned long address);
+#endif
 
 /*
  * These are used to make use of C type-checking..
@@ -62,7 +68,7 @@
 
 #define __MEMORY_START		CONFIG_MEMORY_START
 
-#define PAGE_OFFSET		(0x80000000)
+#define PAGE_OFFSET		(0x80000000UL)
 #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
 #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
 #define virt_to_page(kaddr)	(mem_map + ((__pa(kaddr)-__MEMORY_START) >> PAGE_SHIFT))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)