Skip to content

L
linux
Commit fc2d87d6 authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files
Options

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

- Change PAGE_*_X to PAGE_*_EXEC for good readability.
- Add #include __KERNEL__
- Change __inline__ to inline for the __KERNEL__ portion.
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 b4518cc3
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 98 deletions
include/asm-m32r/pgtable.h
View file @ fc2d87d6
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
#include <asm-generic/4level-fixup.h> #include <asm-generic/4level-fixup.h>
/* $Id$ */ #ifdef __KERNEL__
/* /*
* The Linux memory management assumes a three-level page table setup. On * The Linux memory management assumes a three-level page table setup. On
* the M32R, we use that, but "fold" the mid level into the top-level page * the M32R, we use that, but "fold" the mid level into the top-level page
...@@ -40,11 +39,6 @@ extern unsigned long empty_zero_page[1024]; ...@@ -40,11 +39,6 @@ extern unsigned long empty_zero_page[1024];
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
/*
* The Linux x86 paging architecture is 'compile-time dual-mode', it
* implements both the traditional 2-level x86 page tables and the
* newer 3-level PAE-mode page tables.
*/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/pgtable-2level.h> #include <asm/pgtable-2level.h>
#endif #endif
...@@ -70,14 +64,6 @@ extern unsigned long empty_zero_page[1024]; ...@@ -70,14 +64,6 @@ extern unsigned long empty_zero_page[1024];
#define VMALLOC_START KSEG2 #define VMALLOC_START KSEG2
#define VMALLOC_END KSEG3 #define VMALLOC_END KSEG3
/*
* The 4MB page is guessing.. Detailed in the infamous "Chapter H"
* of the Pentium details, but assuming intel did the straightforward
* thing, this bit set in the page directory entry just means that
* the page directory entry points directly to a 4MB-aligned block of
* memory.
*/
/* /*
* M32R TLB format * M32R TLB format
* *
...@@ -91,43 +77,31 @@ extern unsigned long empty_zero_page[1024]; ...@@ -91,43 +77,31 @@ extern unsigned long empty_zero_page[1024];
* RWX * RWX
*/ */
#define _PAGE_BIT_DIRTY 0 /* software */ #define _PAGE_BIT_DIRTY 0 /* software: page changed */
#define _PAGE_BIT_FILE 0 /* when !present: nonlinear file #define _PAGE_BIT_FILE 0 /* when !present: nonlinear file
mapping */ mapping */
#define _PAGE_BIT_PRESENT 1 /* Valid */ #define _PAGE_BIT_PRESENT 1 /* Valid: page is valid */
#define _PAGE_BIT_GLOBAL 2 /* Global */ #define _PAGE_BIT_GLOBAL 2 /* Global */
#define _PAGE_BIT_LARGE 3 /* Large */ #define _PAGE_BIT_LARGE 3 /* Large */
#define _PAGE_BIT_EXEC 4 /* Execute */ #define _PAGE_BIT_EXEC 4 /* Execute */
#define _PAGE_BIT_WRITE 5 /* Write */ #define _PAGE_BIT_WRITE 5 /* Write */
#define _PAGE_BIT_READ 6 /* Read */ #define _PAGE_BIT_READ 6 /* Read */
#define _PAGE_BIT_NONCACHABLE 7 /* Non cachable */ #define _PAGE_BIT_NONCACHABLE 7 /* Non cachable */
#define _PAGE_BIT_USER 8 /* software */ #define _PAGE_BIT_USER 8 /* software: user space access
#define _PAGE_BIT_ACCESSED 9 /* software */
#define _PAGE_DIRTY \
(1UL << _PAGE_BIT_DIRTY) /* software : page changed */
#define _PAGE_FILE \
(1UL << _PAGE_BIT_FILE) /* when !present: nonlinear file
mapping */
#define _PAGE_PRESENT \
(1UL << _PAGE_BIT_PRESENT) /* Valid : Page is Valid */
#define _PAGE_GLOBAL \
(1UL << _PAGE_BIT_GLOBAL) /* Global */
#define _PAGE_LARGE \
(1UL << _PAGE_BIT_LARGE) /* Large */
#define _PAGE_EXEC \
(1UL << _PAGE_BIT_EXEC) /* Execute */
#define _PAGE_WRITE \
(1UL << _PAGE_BIT_WRITE) /* Write */
#define _PAGE_READ \
(1UL << _PAGE_BIT_READ) /* Read */
#define _PAGE_NONCACHABLE \
(1UL<<_PAGE_BIT_NONCACHABLE) /* Non cachable */
#define _PAGE_USER \
(1UL << _PAGE_BIT_USER) /* software : user space access
allowed */ allowed */
#define _PAGE_ACCESSED \ #define _PAGE_BIT_ACCESSED 9 /* software: page referenced */
(1UL << _PAGE_BIT_ACCESSED) /* software : page referenced */
#define _PAGE_DIRTY (1UL << _PAGE_BIT_DIRTY)
#define _PAGE_FILE (1UL << _PAGE_BIT_FILE)
#define _PAGE_PRESENT (1UL << _PAGE_BIT_PRESENT)
#define _PAGE_GLOBAL (1UL << _PAGE_BIT_GLOBAL)
#define _PAGE_LARGE (1UL << _PAGE_BIT_LARGE)
#define _PAGE_EXEC (1UL << _PAGE_BIT_EXEC)
#define _PAGE_WRITE (1UL << _PAGE_BIT_WRITE)
#define _PAGE_READ (1UL << _PAGE_BIT_READ)
#define _PAGE_NONCACHABLE (1UL << _PAGE_BIT_NONCACHABLE)
#define _PAGE_USER (1UL << _PAGE_BIT_USER)
#define _PAGE_ACCESSED (1UL << _PAGE_BIT_ACCESSED)
#define _PAGE_TABLE \ #define _PAGE_TABLE \
( _PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | _PAGE_USER \ ( _PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | _PAGE_USER \
...@@ -144,17 +118,17 @@ extern unsigned long empty_zero_page[1024]; ...@@ -144,17 +118,17 @@ extern unsigned long empty_zero_page[1024];
#define PAGE_SHARED \ #define PAGE_SHARED \
__pgprot(_PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | _PAGE_USER \ __pgprot(_PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | _PAGE_USER \
| _PAGE_ACCESSED) | _PAGE_ACCESSED)
#define PAGE_SHARED_X \ #define PAGE_SHARED_EXEC \
__pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_WRITE | _PAGE_READ \ __pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_WRITE | _PAGE_READ \
| _PAGE_USER | _PAGE_ACCESSED) | _PAGE_USER | _PAGE_ACCESSED)
#define PAGE_COPY \ #define PAGE_COPY \
__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_USER | _PAGE_ACCESSED) __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_USER | _PAGE_ACCESSED)
#define PAGE_COPY_X \ #define PAGE_COPY_EXEC \
__pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_USER \ __pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_USER \
| _PAGE_ACCESSED) | _PAGE_ACCESSED)
#define PAGE_READONLY \ #define PAGE_READONLY \
__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_USER | _PAGE_ACCESSED) __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_USER | _PAGE_ACCESSED)
#define PAGE_READONLY_X \ #define PAGE_READONLY_EXEC \
__pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_USER \ __pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_USER \
| _PAGE_ACCESSED) | _PAGE_ACCESSED)
...@@ -171,42 +145,37 @@ extern unsigned long empty_zero_page[1024]; ...@@ -171,42 +145,37 @@ extern unsigned long empty_zero_page[1024];
#define PAGE_KERNEL_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE) #define PAGE_KERNEL_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE)
#else #else
#define PAGE_NONE __pgprot(0) #define PAGE_NONE __pgprot(0)
#define PAGE_SHARED __pgprot(0) #define PAGE_SHARED __pgprot(0)
#define PAGE_SHARED_X __pgprot(0) #define PAGE_SHARED_EXEC __pgprot(0)
#define PAGE_COPY __pgprot(0) #define PAGE_COPY __pgprot(0)
#define PAGE_COPY_X __pgprot(0) #define PAGE_COPY_EXEC __pgprot(0)
#define PAGE_READONLY __pgprot(0) #define PAGE_READONLY __pgprot(0)
#define PAGE_READONLY_X __pgprot(0) #define PAGE_READONLY_EXEC __pgprot(0)
#define PAGE_KERNEL __pgprot(0) #define PAGE_KERNEL __pgprot(0)
#define PAGE_KERNEL_RO __pgprot(0) #define PAGE_KERNEL_RO __pgprot(0)
#define PAGE_KERNEL_NOCACHE __pgprot(0) #define PAGE_KERNEL_NOCACHE __pgprot(0)
#endif /* CONFIG_MMU */ #endif /* CONFIG_MMU */
/*
* The i386 can't do page protection for execute, and considers that
* the same are read. Also, write permissions imply read permissions.
* This is the closest we can get..
*/
/* xwr */ /* xwr */
#define __P000 PAGE_NONE #define __P000 PAGE_NONE
#define __P001 PAGE_READONLY #define __P001 PAGE_READONLY
#define __P010 PAGE_COPY #define __P010 PAGE_COPY
#define __P011 PAGE_COPY #define __P011 PAGE_COPY
#define __P100 PAGE_READONLY_X #define __P100 PAGE_READONLY_EXEC
#define __P101 PAGE_READONLY_X #define __P101 PAGE_READONLY_EXEC
#define __P110 PAGE_COPY_X #define __P110 PAGE_COPY_EXEC
#define __P111 PAGE_COPY_X #define __P111 PAGE_COPY_EXEC
#define __S000 PAGE_NONE #define __S000 PAGE_NONE
#define __S001 PAGE_READONLY #define __S001 PAGE_READONLY
#define __S010 PAGE_SHARED #define __S010 PAGE_SHARED
#define __S011 PAGE_SHARED #define __S011 PAGE_SHARED
#define __S100 PAGE_READONLY_X #define __S100 PAGE_READONLY_EXEC
#define __S101 PAGE_READONLY_X #define __S101 PAGE_READONLY_EXEC
#define __S110 PAGE_SHARED_X #define __S110 PAGE_SHARED_EXEC
#define __S111 PAGE_SHARED_X #define __S111 PAGE_SHARED_EXEC
/* page table for 0-4MB for everybody */ /* page table for 0-4MB for everybody */
...@@ -225,32 +194,32 @@ extern unsigned long empty_zero_page[1024]; ...@@ -225,32 +194,32 @@ extern unsigned long empty_zero_page[1024];
* The following only work if pte_present() is true. * The following only work if pte_present() is true.
* Undefined behaviour if not.. * Undefined behaviour if not..
*/ */
static __inline__ int pte_user(pte_t pte) static inline int pte_user(pte_t pte)
{ {
return pte_val(pte) & _PAGE_USER; return pte_val(pte) & _PAGE_USER;
} }
static __inline__ int pte_read(pte_t pte) static inline int pte_read(pte_t pte)
{ {
return pte_val(pte) & _PAGE_READ; return pte_val(pte) & _PAGE_READ;
} }
static __inline__ int pte_exec(pte_t pte) static inline int pte_exec(pte_t pte)
{ {
return pte_val(pte) & _PAGE_EXEC; return pte_val(pte) & _PAGE_EXEC;
} }
static __inline__ int pte_dirty(pte_t pte) static inline int pte_dirty(pte_t pte)
{ {
return pte_val(pte) & _PAGE_DIRTY; return pte_val(pte) & _PAGE_DIRTY;
} }
static __inline__ int pte_young(pte_t pte) static inline int pte_young(pte_t pte)
{ {
return pte_val(pte) & _PAGE_ACCESSED; return pte_val(pte) & _PAGE_ACCESSED;
} }
static __inline__ int pte_write(pte_t pte) static inline int pte_write(pte_t pte)
{ {
return pte_val(pte) & _PAGE_WRITE; return pte_val(pte) & _PAGE_WRITE;
} }
...@@ -258,85 +227,87 @@ static __inline__ int pte_write(pte_t pte) ...@@ -258,85 +227,87 @@ static __inline__ int pte_write(pte_t pte)
/* /*
* The following only works if pte_present() is not true. * The following only works if pte_present() is not true.
*/ */
static __inline__ int pte_file(pte_t pte) static inline int pte_file(pte_t pte)
{ {
return pte_val(pte) & _PAGE_FILE; return pte_val(pte) & _PAGE_FILE;
} }
static __inline__ pte_t pte_rdprotect(pte_t pte) static inline pte_t pte_rdprotect(pte_t pte)
{ {
pte_val(pte) &= ~_PAGE_READ; pte_val(pte) &= ~_PAGE_READ;
return pte; return pte;
} }
static __inline__ pte_t pte_exprotect(pte_t pte) static inline pte_t pte_exprotect(pte_t pte)
{ {
pte_val(pte) &= ~_PAGE_EXEC; pte_val(pte) &= ~_PAGE_EXEC;
return pte; return pte;
} }
static __inline__ pte_t pte_mkclean(pte_t pte) static inline pte_t pte_mkclean(pte_t pte)
{ {
pte_val(pte) &= ~_PAGE_DIRTY; pte_val(pte) &= ~_PAGE_DIRTY;
return pte; return pte;
} }
static __inline__ pte_t pte_mkold(pte_t pte) static inline pte_t pte_mkold(pte_t pte)
{ {
pte_val(pte) &= ~_PAGE_ACCESSED;return pte;} pte_val(pte) &= ~_PAGE_ACCESSED;
return pte;
}
static __inline__ pte_t pte_wrprotect(pte_t pte) static inline pte_t pte_wrprotect(pte_t pte)
{ {
pte_val(pte) &= ~_PAGE_WRITE; pte_val(pte) &= ~_PAGE_WRITE;
return pte; return pte;
} }
static __inline__ pte_t pte_mkread(pte_t pte) static inline pte_t pte_mkread(pte_t pte)
{ {
pte_val(pte) |= _PAGE_READ; pte_val(pte) |= _PAGE_READ;
return pte; return pte;
} }
static __inline__ pte_t pte_mkexec(pte_t pte) static inline pte_t pte_mkexec(pte_t pte)
{ {
pte_val(pte) |= _PAGE_EXEC; pte_val(pte) |= _PAGE_EXEC;
return pte; return pte;
} }
static __inline__ pte_t pte_mkdirty(pte_t pte) static inline pte_t pte_mkdirty(pte_t pte)
{ {
pte_val(pte) |= _PAGE_DIRTY; pte_val(pte) |= _PAGE_DIRTY;
return pte; return pte;
} }
static __inline__ pte_t pte_mkyoung(pte_t pte) static inline pte_t pte_mkyoung(pte_t pte)
{ {
pte_val(pte) |= _PAGE_ACCESSED; pte_val(pte) |= _PAGE_ACCESSED;
return pte; return pte;
} }
static __inline__ pte_t pte_mkwrite(pte_t pte) static inline pte_t pte_mkwrite(pte_t pte)
{ {
pte_val(pte) |= _PAGE_WRITE; pte_val(pte) |= _PAGE_WRITE;
return pte; return pte;
} }
static __inline__ int ptep_test_and_clear_dirty(pte_t *ptep) static inline int ptep_test_and_clear_dirty(pte_t *ptep)
{ {
return test_and_clear_bit(_PAGE_BIT_DIRTY, ptep); return test_and_clear_bit(_PAGE_BIT_DIRTY, ptep);
} }
static __inline__ int ptep_test_and_clear_young(pte_t *ptep) static inline int ptep_test_and_clear_young(pte_t *ptep)
{ {
return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep); return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
} }
static __inline__ void ptep_set_wrprotect(pte_t *ptep) static inline void ptep_set_wrprotect(pte_t *ptep)
{ {
clear_bit(_PAGE_BIT_WRITE, ptep); clear_bit(_PAGE_BIT_WRITE, ptep);
} }
static __inline__ void ptep_mkdirty(pte_t *ptep) static inline void ptep_mkdirty(pte_t *ptep)
{ {
set_bit(_PAGE_BIT_DIRTY, ptep); set_bit(_PAGE_BIT_DIRTY, ptep);
} }
...@@ -344,7 +315,7 @@ static __inline__ void ptep_mkdirty(pte_t *ptep) ...@@ -344,7 +315,7 @@ static __inline__ void ptep_mkdirty(pte_t *ptep)
/* /*
* Macro and implementation to make a page protection as uncachable. * Macro and implementation to make a page protection as uncachable.
*/ */
static __inline__ pgprot_t pgprot_noncached(pgprot_t _prot) static inline pgprot_t pgprot_noncached(pgprot_t _prot)
{ {
unsigned long prot = pgprot_val(_prot); unsigned long prot = pgprot_val(_prot);
...@@ -360,7 +331,7 @@ static __inline__ pgprot_t pgprot_noncached(pgprot_t _prot) ...@@ -360,7 +331,7 @@ static __inline__ pgprot_t pgprot_noncached(pgprot_t _prot)
*/ */
#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), pgprot) #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), pgprot)
static __inline__ pte_t pte_modify(pte_t pte, pgprot_t newprot) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{ {
set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) \ set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) \
| pgprot_val(newprot))); | pgprot_val(newprot)));
...@@ -375,7 +346,7 @@ static __inline__ pte_t pte_modify(pte_t pte, pgprot_t newprot) ...@@ -375,7 +346,7 @@ static __inline__ pte_t pte_modify(pte_t pte, pgprot_t newprot)
* and a page entry and page directory to the page they refer to. * and a page entry and page directory to the page they refer to.
*/ */
static __inline__ void pmd_set(pmd_t * pmdp, pte_t * ptep) static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
{ {
pmd_val(*pmdp) = (((unsigned long) ptep) & PAGE_MASK); pmd_val(*pmdp) = (((unsigned long) ptep) & PAGE_MASK);
} }
...@@ -422,8 +393,8 @@ static __inline__ void pmd_set(pmd_t * pmdp, pte_t * ptep) ...@@ -422,8 +393,8 @@ static __inline__ void pmd_set(pmd_t * pmdp, pte_t * ptep)
/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
#define kern_addr_valid(addr) (1) #define kern_addr_valid(addr) (1)
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \ #define io_remap_page_range(vma, vaddr, paddr, size, prot) \
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
...@@ -433,5 +404,6 @@ static __inline__ void pmd_set(pmd_t * pmdp, pte_t * ptep) ...@@ -433,5 +404,6 @@ static __inline__ void pmd_set(pmd_t * pmdp, pte_t * ptep)
#define __HAVE_ARCH_PTE_SAME #define __HAVE_ARCH_PTE_SAME
#include <asm-generic/pgtable.h> #include <asm-generic/pgtable.h>
#endif /* _ASM_M32R_PGTABLE_H */ #endif /* __KERNEL__ */
#endif /* _ASM_M32R_PGTABLE_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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7