diff options
author | Jan Beulich <jbeulich@novell.com> | 2007-07-16 02:38:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:36 -0400 |
commit | 45e98cdb6d365b34b7a2d849e4d8bdc264d8e6e4 (patch) | |
tree | 172a959293a2c31691a162eca6af131e3ac89da2 /arch/sparc | |
parent | 98011f569e2ae1e4ae394f6e23faa16676d50de4 (diff) |
page table handling cleanup
Kill pte_rdprotect(), pte_exprotect(), pte_mkread(), pte_mkexec(), pte_read(),
pte_exec(), and pte_user() except where arch-specific code is making use of
them.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/mm/srmmu.c | 4 | ||||
-rw-r--r-- | arch/sparc/mm/sun4c.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index e5eaa8072ae0..ca26232da7ab 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
@@ -160,9 +160,6 @@ static inline int srmmu_pte_none(pte_t pte) | |||
160 | static inline int srmmu_pte_present(pte_t pte) | 160 | static inline int srmmu_pte_present(pte_t pte) |
161 | { return ((pte_val(pte) & SRMMU_ET_MASK) == SRMMU_ET_PTE); } | 161 | { return ((pte_val(pte) & SRMMU_ET_MASK) == SRMMU_ET_PTE); } |
162 | 162 | ||
163 | static inline int srmmu_pte_read(pte_t pte) | ||
164 | { return !(pte_val(pte) & SRMMU_NOREAD); } | ||
165 | |||
166 | static inline void srmmu_pte_clear(pte_t *ptep) | 163 | static inline void srmmu_pte_clear(pte_t *ptep) |
167 | { srmmu_set_pte(ptep, __pte(0)); } | 164 | { srmmu_set_pte(ptep, __pte(0)); } |
168 | 165 | ||
@@ -2181,7 +2178,6 @@ void __init ld_mmu_srmmu(void) | |||
2181 | 2178 | ||
2182 | BTFIXUPSET_CALL(pte_present, srmmu_pte_present, BTFIXUPCALL_NORM); | 2179 | BTFIXUPSET_CALL(pte_present, srmmu_pte_present, BTFIXUPCALL_NORM); |
2183 | BTFIXUPSET_CALL(pte_clear, srmmu_pte_clear, BTFIXUPCALL_SWAPO0G0); | 2180 | BTFIXUPSET_CALL(pte_clear, srmmu_pte_clear, BTFIXUPCALL_SWAPO0G0); |
2184 | BTFIXUPSET_CALL(pte_read, srmmu_pte_read, BTFIXUPCALL_NORM); | ||
2185 | 2181 | ||
2186 | BTFIXUPSET_CALL(pmd_bad, srmmu_pmd_bad, BTFIXUPCALL_NORM); | 2182 | BTFIXUPSET_CALL(pmd_bad, srmmu_pmd_bad, BTFIXUPCALL_NORM); |
2187 | BTFIXUPSET_CALL(pmd_present, srmmu_pmd_present, BTFIXUPCALL_NORM); | 2183 | BTFIXUPSET_CALL(pmd_present, srmmu_pmd_present, BTFIXUPCALL_NORM); |
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 436021ceb2e7..bdd835fba02e 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
@@ -1748,11 +1748,6 @@ static int sun4c_pte_present(pte_t pte) | |||
1748 | } | 1748 | } |
1749 | static void sun4c_pte_clear(pte_t *ptep) { *ptep = __pte(0); } | 1749 | static void sun4c_pte_clear(pte_t *ptep) { *ptep = __pte(0); } |
1750 | 1750 | ||
1751 | static int sun4c_pte_read(pte_t pte) | ||
1752 | { | ||
1753 | return (pte_val(pte) & _SUN4C_PAGE_READ); | ||
1754 | } | ||
1755 | |||
1756 | static int sun4c_pmd_bad(pmd_t pmd) | 1751 | static int sun4c_pmd_bad(pmd_t pmd) |
1757 | { | 1752 | { |
1758 | return (((pmd_val(pmd) & ~PAGE_MASK) != PGD_TABLE) || | 1753 | return (((pmd_val(pmd) & ~PAGE_MASK) != PGD_TABLE) || |
@@ -2212,7 +2207,6 @@ void __init ld_mmu_sun4c(void) | |||
2212 | 2207 | ||
2213 | BTFIXUPSET_CALL(pte_present, sun4c_pte_present, BTFIXUPCALL_NORM); | 2208 | BTFIXUPSET_CALL(pte_present, sun4c_pte_present, BTFIXUPCALL_NORM); |
2214 | BTFIXUPSET_CALL(pte_clear, sun4c_pte_clear, BTFIXUPCALL_STG0O0); | 2209 | BTFIXUPSET_CALL(pte_clear, sun4c_pte_clear, BTFIXUPCALL_STG0O0); |
2215 | BTFIXUPSET_CALL(pte_read, sun4c_pte_read, BTFIXUPCALL_NORM); | ||
2216 | 2210 | ||
2217 | BTFIXUPSET_CALL(pmd_bad, sun4c_pmd_bad, BTFIXUPCALL_NORM); | 2211 | BTFIXUPSET_CALL(pmd_bad, sun4c_pmd_bad, BTFIXUPCALL_NORM); |
2218 | BTFIXUPSET_CALL(pmd_present, sun4c_pmd_present, BTFIXUPCALL_NORM); | 2212 | BTFIXUPSET_CALL(pmd_present, sun4c_pmd_present, BTFIXUPCALL_NORM); |