Skip to content

Commit

Permalink
sh: Sanitize asm/mmu.h for assembly use.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Francesco VIRLINZI authored and Paul Mundt committed Mar 30, 2009
1 parent 1c58b0b commit 3b4df71
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions arch/sh/include/asm/mmu.h
Original file line number Diff line number Diff line change
@@ -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
*/
Expand All @@ -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 {
Expand Down Expand Up @@ -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 */

0 comments on commit 3b4df71

Please sign in to comment.