diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:56:24 +0100 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:56:24 +0100 |
commit | cbe56159a3e60624b5f44cf48b640fa470436e34 (patch) | |
tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /include/asm-m32r/mmu.h | |
parent | Merge branch 'master' into 83xx (diff) | |
parent | [POWERPC] spufs: Fix bitrot of the SPU mmap facility (diff) | |
download | linux-cbe56159a3e60624b5f44cf48b640fa470436e34.tar.xz linux-cbe56159a3e60624b5f44cf48b640fa470436e34.zip |
Merge branch 'master' into 83xx
Diffstat (limited to 'include/asm-m32r/mmu.h')
-rw-r--r-- | include/asm-m32r/mmu.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/asm-m32r/mmu.h b/include/asm-m32r/mmu.h index cf3f6d78ac66..d9bd724479cf 100644 --- a/include/asm-m32r/mmu.h +++ b/include/asm-m32r/mmu.h @@ -1,13 +1,14 @@ #ifndef _ASM_M32R_MMU_H #define _ASM_M32R_MMU_H - #if !defined(CONFIG_MMU) + typedef struct { struct vm_list_struct *vmlist; unsigned long end_brk; } mm_context_t; -#else + +#else /* CONFIG_MMU */ /* Default "unsigned long" context */ #ifndef CONFIG_SMP @@ -16,5 +17,6 @@ typedef unsigned long mm_context_t; typedef unsigned long mm_context_t[NR_CPUS]; #endif -#endif /* CONFIG_MMU */ -#endif /* _ASM_M32R_MMU_H */ +#endif /* CONFIG_MMU */ + +#endif /* _ASM_M32R_MMU_H */ |