Commit 1b56ca0a authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds

[PATCH] m32r: Clean up include/asm-m32r/pgtable-2level.h

- Add #ifdef __KERNEL__
- Change __inline__ to inline for __KERNEL__ portion.
- Remove RCS ID string.
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87f378d6
#ifndef _ASM_M32R_PGTABLE_2LEVEL_H #ifndef _ASM_M32R_PGTABLE_2LEVEL_H
#define _ASM_M32R_PGTABLE_2LEVEL_H #define _ASM_M32R_PGTABLE_2LEVEL_H
/* $Id$ */ #ifdef __KERNEL__
#include <linux/config.h> #include <linux/config.h>
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
* setup: the pgd is never bad, and a pmd always exists (as it's folded * setup: the pgd is never bad, and a pmd always exists (as it's folded
* into the pgd entry) * into the pgd entry)
*/ */
static __inline__ int pgd_none(pgd_t pgd) { return 0; } static inline int pgd_none(pgd_t pgd) { return 0; }
static __inline__ int pgd_bad(pgd_t pgd) { return 0; } static inline int pgd_bad(pgd_t pgd) { return 0; }
static __inline__ int pgd_present(pgd_t pgd) { return 1; } static inline int pgd_present(pgd_t pgd) { return 1; }
#define pgd_clear(xp) do { } while (0) #define pgd_clear(xp) do { } while (0)
/* /*
...@@ -55,7 +55,7 @@ static __inline__ int pgd_present(pgd_t pgd) { return 1; } ...@@ -55,7 +55,7 @@ static __inline__ int pgd_present(pgd_t pgd) { return 1; }
#define pgd_page(pgd) \ #define pgd_page(pgd) \
((unsigned long) __va(pgd_val(pgd) & PAGE_MASK)) ((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
static __inline__ pmd_t *pmd_offset(pgd_t * dir, unsigned long address) static inline pmd_t *pmd_offset(pgd_t * dir, unsigned long address)
{ {
return (pmd_t *) dir; return (pmd_t *) dir;
} }
...@@ -72,4 +72,6 @@ static __inline__ pmd_t *pmd_offset(pgd_t * dir, unsigned long address) ...@@ -72,4 +72,6 @@ static __inline__ pmd_t *pmd_offset(pgd_t * dir, unsigned long address)
#define pte_to_pgoff(pte) (((pte_val(pte) >> 2) & 0xef) | (((pte_val(pte) >> 10)) << 7)) #define pte_to_pgoff(pte) (((pte_val(pte) >> 2) & 0xef) | (((pte_val(pte) >> 10)) << 7))
#define pgoff_to_pte(off) ((pte_t) { (((off) & 0xef) << 2) | (((off) >> 7) << 10) | _PAGE_FILE }) #define pgoff_to_pte(off) ((pte_t) { (((off) & 0xef) << 2) | (((off) >> 7) << 10) | _PAGE_FILE })
#endif /* __KERNEL__ */
#endif /* _ASM_M32R_PGTABLE_2LEVEL_H */ #endif /* _ASM_M32R_PGTABLE_2LEVEL_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment