|
From: Paul M. <le...@us...> - 2006-07-24 22:42:50
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22552/include/asm-sh Modified Files: io.h addrspace.h Log Message: More nommu fixups from Sato-san. Index: io.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/io.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- io.h 5 Jul 2006 08:46:49 -0000 1.20 +++ io.h 24 Jul 2006 22:42:46 -0000 1.21 @@ -217,6 +217,7 @@ #define IO_SPACE_LIMIT 0xffffffff +#ifdef CONFIG_MMU /* * Change virtual addresses to physical addresses and vv. * These are trivial on the 1:1 Linux/SuperH mapping @@ -230,6 +231,10 @@ { return (void *)P1SEGADDR(address); } +#else +#define phys_to_virt(address) ((void *)(address)) +#define virt_to_phys(address) ((unsigned long)(address)) +#endif #define virt_to_bus virt_to_phys #define bus_to_virt phys_to_virt Index: addrspace.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/addrspace.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- addrspace.h 19 Jul 2006 14:46:07 -0000 1.5 +++ addrspace.h 24 Jul 2006 22:42:46 -0000 1.6 @@ -14,7 +14,7 @@ #include <asm/cpu/addrspace.h> /* Memory segments (32bit Privileged mode addresses) */ -#ifdef CONFIG_MMU +#ifndef CONFIG_CPU_SH2A #define P0SEG 0x00000000 #define P1SEG 0x80000000 #define P2SEG 0xa0000000 @@ -24,7 +24,7 @@ #define P0SEG 0x00000000 #define P1SEG 0x00000000 #define P2SEG 0x20000000 -#define P3SEG 0x40000000 +#define P3SEG 0x00000000 #define P4SEG 0x80000000 #endif |