diff options
| author | Francesco VIRLINZI <francesco.virlinzi@st.com> | 2009-03-24 13:30:01 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-31 07:42:37 +0900 |
| commit | 3b4df71b364e230fb7b02356d1f8fce64838ddc7 (patch) | |
| tree | 0a5241ecf7c7a020f7470de27dd383e8846f8c1a /arch/sh | |
| parent | 1c58b0b1a1412ceb6b25dad81bc537bf0fe6ad46 (diff) | |
| download | linux-3b4df71b364e230fb7b02356d1f8fce64838ddc7.tar.gz linux-3b4df71b364e230fb7b02356d1f8fce64838ddc7.tar.bz2 linux-3b4df71b364e230fb7b02356d1f8fce64838ddc7.zip | |
sh: Sanitize asm/mmu.h for assembly use.
This patch adds the ifndef __ASSEMBLY__ preprocessor to allow the
defines in the file to be used also in assembly code.
Signed-off-by: Francesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/mmu.h | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/arch/sh/include/asm/mmu.h b/arch/sh/include/asm/mmu.h index 6c43625bb1a5..f5963037c9d6 100644 --- a/arch/sh/include/asm/mmu.h +++ b/arch/sh/include/asm/mmu.h @@ -1,22 +1,6 @@ #ifndef __MMU_H #define __MMU_H -/* Default "unsigned long" context */ -typedef unsigned long mm_context_id_t[NR_CPUS]; - -typedef struct { -#ifdef CONFIG_MMU - mm_context_id_t id; - void *vdso; -#else - unsigned long end_brk; -#endif -#ifdef CONFIG_BINFMT_ELF_FDPIC - unsigned long exec_fdpic_loadmap; - unsigned long interp_fdpic_loadmap; -#endif -} mm_context_t; - /* * Privileged Space Mapping Buffer (PMB) definitions */ @@ -41,6 +25,24 @@ typedef struct { #define PMB_NO_ENTRY (-1) +#ifndef __ASSEMBLY__ + +/* Default "unsigned long" context */ +typedef unsigned long mm_context_id_t[NR_CPUS]; + +typedef struct { +#ifdef CONFIG_MMU + mm_context_id_t id; + void *vdso; +#else + unsigned long end_brk; +#endif +#ifdef CONFIG_BINFMT_ELF_FDPIC + unsigned long exec_fdpic_loadmap; + unsigned long interp_fdpic_loadmap; +#endif +} mm_context_t; + struct pmb_entry; struct pmb_entry { @@ -70,6 +72,7 @@ void pmb_free(struct pmb_entry *pmbe); long pmb_remap(unsigned long virt, unsigned long phys, unsigned long size, unsigned long flags); void pmb_unmap(unsigned long addr); +#endif /* __ASSEMBLY__ */ #endif /* __MMU_H */ |