This patch is for updating m32r's MMU-less support. * arch/m32r/boot/compressed/m32r_sio.c: - Fix serial output routine
* include/asm-m32r/mmu.h: - Update mm_context_t definition Signed-off-by: Yoshinori Sato <[EMAIL PROTECTED]> Signed-off-by: Hirokazu Takata <[EMAIL PROTECTED]> --- arch/m32r/boot/compressed/m32r_sio.c | 7 ++++++- include/asm-m32r/mmu.h | 18 ++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff -ruNp a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c --- a/arch/m32r/boot/compressed/m32r_sio.c 2004-12-25 06:34:58.000000000 +0900 +++ b/arch/m32r/boot/compressed/m32r_sio.c 2005-03-23 20:28:24.846369405 +0900 @@ -46,9 +46,14 @@ static void putc(char c) } *BOOT_SIO0TXB = c; } -#else +#else /* defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) */ +#ifdef CONFIG_MMU #define SIO0STS (volatile unsigned short *)(0xa0efd000 + 14) #define SIO0TXB (volatile unsigned short *)(0xa0efd000 + 30) +#else +#define SIO0STS (volatile unsigned short *)(0x00efd000 + 14) +#define SIO0TXB (volatile unsigned short *)(0x00efd000 + 30) +#endif static void putc(char c) { diff -ruNp a/include/asm-m32r/mmu.h b/include/asm-m32r/mmu.h --- a/include/asm-m32r/mmu.h 2004-12-25 06:34:44.000000000 +0900 +++ b/include/asm-m32r/mmu.h 2005-03-23 20:26:57.473769245 +0900 @@ -1,25 +1,12 @@ #ifndef _ASM_M32R_MMU_H #define _ASM_M32R_MMU_H -/* $Id$ */ - #include <linux/config.h> #if !defined(CONFIG_MMU) -struct mm_rblock_struct { - int size; - int refcount; - void *kblock; -}; - -struct mm_tblock_struct { - struct mm_rblock_struct *rblock; - struct mm_tblock_struct *next; -}; - typedef struct { - struct mm_tblock_struct tblock; - unsigned long end_brk; + struct vm_list_struct *vmlist; + unsigned long end_brk; } mm_context_t; #else @@ -32,4 +19,3 @@ typedef unsigned long mm_context_t[NR_CP #endif /* CONFIG_MMU */ #endif /* _ASM_M32R_MMU_H */ - -- Hirokazu Takata <[EMAIL PROTECTED]> Linux/M32R Project: http://www.linux-m32r.org/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/