diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-11-07 03:58:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:30 -0500 |
commit | d9b5444eeb3a663ca4a625878b1421c9e9b18e8b (patch) | |
tree | 6cc32711116977944043c54e0c196c75358916be /include/asm-cris/pgtable.h | |
parent | 5f9c3cbcd5d41be597aef9c0ff64ebfc8a91cd6f (diff) |
[PATCH] cris: "extern inline" -> "static inline"
"extern inline" doesn't make much sense.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-cris/pgtable.h')
-rw-r--r-- | include/asm-cris/pgtable.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/include/asm-cris/pgtable.h b/include/asm-cris/pgtable.h index a9143bed99db..70a832514f62 100644 --- a/include/asm-cris/pgtable.h +++ b/include/asm-cris/pgtable.h | |||
@@ -112,44 +112,44 @@ extern unsigned long empty_zero_page; | |||
112 | * Undefined behaviour if not.. | 112 | * Undefined behaviour if not.. |
113 | */ | 113 | */ |
114 | 114 | ||
115 | extern inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_READ; } | 115 | static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_READ; } |
116 | extern inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; } | 116 | static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; } |
117 | extern inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_READ; } | 117 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_READ; } |
118 | extern inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_MODIFIED; } | 118 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_MODIFIED; } |
119 | extern inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } | 119 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } |
120 | extern inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } | 120 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } |
121 | 121 | ||
122 | extern inline pte_t pte_wrprotect(pte_t pte) | 122 | static inline pte_t pte_wrprotect(pte_t pte) |
123 | { | 123 | { |
124 | pte_val(pte) &= ~(_PAGE_WRITE | _PAGE_SILENT_WRITE); | 124 | pte_val(pte) &= ~(_PAGE_WRITE | _PAGE_SILENT_WRITE); |
125 | return pte; | 125 | return pte; |
126 | } | 126 | } |
127 | 127 | ||
128 | extern inline pte_t pte_rdprotect(pte_t pte) | 128 | static inline pte_t pte_rdprotect(pte_t pte) |
129 | { | 129 | { |
130 | pte_val(pte) &= ~(_PAGE_READ | _PAGE_SILENT_READ); | 130 | pte_val(pte) &= ~(_PAGE_READ | _PAGE_SILENT_READ); |
131 | return pte; | 131 | return pte; |
132 | } | 132 | } |
133 | 133 | ||
134 | extern inline pte_t pte_exprotect(pte_t pte) | 134 | static inline pte_t pte_exprotect(pte_t pte) |
135 | { | 135 | { |
136 | pte_val(pte) &= ~(_PAGE_READ | _PAGE_SILENT_READ); | 136 | pte_val(pte) &= ~(_PAGE_READ | _PAGE_SILENT_READ); |
137 | return pte; | 137 | return pte; |
138 | } | 138 | } |
139 | 139 | ||
140 | extern inline pte_t pte_mkclean(pte_t pte) | 140 | static inline pte_t pte_mkclean(pte_t pte) |
141 | { | 141 | { |
142 | pte_val(pte) &= ~(_PAGE_MODIFIED | _PAGE_SILENT_WRITE); | 142 | pte_val(pte) &= ~(_PAGE_MODIFIED | _PAGE_SILENT_WRITE); |
143 | return pte; | 143 | return pte; |
144 | } | 144 | } |
145 | 145 | ||
146 | extern inline pte_t pte_mkold(pte_t pte) | 146 | static inline pte_t pte_mkold(pte_t pte) |
147 | { | 147 | { |
148 | pte_val(pte) &= ~(_PAGE_ACCESSED | _PAGE_SILENT_READ); | 148 | pte_val(pte) &= ~(_PAGE_ACCESSED | _PAGE_SILENT_READ); |
149 | return pte; | 149 | return pte; |
150 | } | 150 | } |
151 | 151 | ||
152 | extern inline pte_t pte_mkwrite(pte_t pte) | 152 | static inline pte_t pte_mkwrite(pte_t pte) |
153 | { | 153 | { |
154 | pte_val(pte) |= _PAGE_WRITE; | 154 | pte_val(pte) |= _PAGE_WRITE; |
155 | if (pte_val(pte) & _PAGE_MODIFIED) | 155 | if (pte_val(pte) & _PAGE_MODIFIED) |
@@ -157,7 +157,7 @@ extern inline pte_t pte_mkwrite(pte_t pte) | |||
157 | return pte; | 157 | return pte; |
158 | } | 158 | } |
159 | 159 | ||
160 | extern inline pte_t pte_mkread(pte_t pte) | 160 | static inline pte_t pte_mkread(pte_t pte) |
161 | { | 161 | { |
162 | pte_val(pte) |= _PAGE_READ; | 162 | pte_val(pte) |= _PAGE_READ; |
163 | if (pte_val(pte) & _PAGE_ACCESSED) | 163 | if (pte_val(pte) & _PAGE_ACCESSED) |
@@ -165,7 +165,7 @@ extern inline pte_t pte_mkread(pte_t pte) | |||
165 | return pte; | 165 | return pte; |
166 | } | 166 | } |
167 | 167 | ||
168 | extern inline pte_t pte_mkexec(pte_t pte) | 168 | static inline pte_t pte_mkexec(pte_t pte) |
169 | { | 169 | { |
170 | pte_val(pte) |= _PAGE_READ; | 170 | pte_val(pte) |= _PAGE_READ; |
171 | if (pte_val(pte) & _PAGE_ACCESSED) | 171 | if (pte_val(pte) & _PAGE_ACCESSED) |
@@ -173,7 +173,7 @@ extern inline pte_t pte_mkexec(pte_t pte) | |||
173 | return pte; | 173 | return pte; |
174 | } | 174 | } |
175 | 175 | ||
176 | extern inline pte_t pte_mkdirty(pte_t pte) | 176 | static inline pte_t pte_mkdirty(pte_t pte) |
177 | { | 177 | { |
178 | pte_val(pte) |= _PAGE_MODIFIED; | 178 | pte_val(pte) |= _PAGE_MODIFIED; |
179 | if (pte_val(pte) & _PAGE_WRITE) | 179 | if (pte_val(pte) & _PAGE_WRITE) |
@@ -181,7 +181,7 @@ extern inline pte_t pte_mkdirty(pte_t pte) | |||
181 | return pte; | 181 | return pte; |
182 | } | 182 | } |
183 | 183 | ||
184 | extern inline pte_t pte_mkyoung(pte_t pte) | 184 | static inline pte_t pte_mkyoung(pte_t pte) |
185 | { | 185 | { |
186 | pte_val(pte) |= _PAGE_ACCESSED; | 186 | pte_val(pte) |= _PAGE_ACCESSED; |
187 | if (pte_val(pte) & _PAGE_READ) | 187 | if (pte_val(pte) & _PAGE_READ) |
@@ -205,7 +205,7 @@ extern inline pte_t pte_mkyoung(pte_t pte) | |||
205 | * addresses (the 0xc0xxxxxx's) goes as void *'s. | 205 | * addresses (the 0xc0xxxxxx's) goes as void *'s. |
206 | */ | 206 | */ |
207 | 207 | ||
208 | extern inline pte_t __mk_pte(void * page, pgprot_t pgprot) | 208 | static inline pte_t __mk_pte(void * page, pgprot_t pgprot) |
209 | { | 209 | { |
210 | pte_t pte; | 210 | pte_t pte; |
211 | /* the PTE needs a physical address */ | 211 | /* the PTE needs a physical address */ |
@@ -223,7 +223,7 @@ extern inline pte_t __mk_pte(void * page, pgprot_t pgprot) | |||
223 | __pte; \ | 223 | __pte; \ |
224 | }) | 224 | }) |
225 | 225 | ||
226 | extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | 226 | static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) |
227 | { pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; } | 227 | { pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; } |
228 | 228 | ||
229 | 229 | ||
@@ -232,7 +232,7 @@ extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | |||
232 | * pte_pagenr refers to the page-number counted starting from the virtual DRAM start | 232 | * pte_pagenr refers to the page-number counted starting from the virtual DRAM start |
233 | */ | 233 | */ |
234 | 234 | ||
235 | extern inline unsigned long __pte_page(pte_t pte) | 235 | static inline unsigned long __pte_page(pte_t pte) |
236 | { | 236 | { |
237 | /* the PTE contains a physical address */ | 237 | /* the PTE contains a physical address */ |
238 | return (unsigned long)__va(pte_val(pte) & PAGE_MASK); | 238 | return (unsigned long)__va(pte_val(pte) & PAGE_MASK); |
@@ -250,7 +250,7 @@ extern inline unsigned long __pte_page(pte_t pte) | |||
250 | * don't need the __pa and __va transformations. | 250 | * don't need the __pa and __va transformations. |
251 | */ | 251 | */ |
252 | 252 | ||
253 | extern inline void pmd_set(pmd_t * pmdp, pte_t * ptep) | 253 | static inline void pmd_set(pmd_t * pmdp, pte_t * ptep) |
254 | { pmd_val(*pmdp) = _PAGE_TABLE | (unsigned long) ptep; } | 254 | { pmd_val(*pmdp) = _PAGE_TABLE | (unsigned long) ptep; } |
255 | 255 | ||
256 | #define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)) | 256 | #define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)) |
@@ -260,7 +260,7 @@ extern inline void pmd_set(pmd_t * pmdp, pte_t * ptep) | |||
260 | #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) | 260 | #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) |
261 | 261 | ||
262 | /* to find an entry in a page-table-directory */ | 262 | /* to find an entry in a page-table-directory */ |
263 | extern inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address) | 263 | static inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address) |
264 | { | 264 | { |
265 | return mm->pgd + pgd_index(address); | 265 | return mm->pgd + pgd_index(address); |
266 | } | 266 | } |
@@ -296,7 +296,7 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* defined in head.S */ | |||
296 | * | 296 | * |
297 | * Actually I am not sure on what this could be used for. | 297 | * Actually I am not sure on what this could be used for. |
298 | */ | 298 | */ |
299 | extern inline void update_mmu_cache(struct vm_area_struct * vma, | 299 | static inline void update_mmu_cache(struct vm_area_struct * vma, |
300 | unsigned long address, pte_t pte) | 300 | unsigned long address, pte_t pte) |
301 | { | 301 | { |
302 | } | 302 | } |