lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Sanitize asm/mmu.h for assembly use.

Browse Source 
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>
This commit is contained in:
Francesco VIRLINZI
2009-03-24 13:30:01 +00:00
committed by Paul Mundt
parent 1c58b0b1a1
commit 3b4df71b36
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
arch/sh/include/asm/mmu.h
View File

@@ -1,22 +1,6 @@
#ifndef __MMU_H #ifndef __MMU_H
#define __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 * Privileged Space Mapping Buffer (PMB) definitions
*/ */
@@ -41,6 +25,24 @@ typedef struct {
#define PMB_NO_ENTRY (-1) #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;
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, long pmb_remap(unsigned long virt, unsigned long phys,
unsigned long size, unsigned long flags); unsigned long size, unsigned long flags);
void pmb_unmap(unsigned long addr); void pmb_unmap(unsigned long addr);
#endif /* __ASSEMBLY__ */
#endif /* __MMU_H */ #endif /* __MMU_H */