projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get_user_pages: don't try to follow PFNMAP pages
[powerpc.git]
/
include
/
asm-sparc
/
pgtable.h
diff --git
a/include/asm-sparc/pgtable.h
b/include/asm-sparc/pgtable.h
index
8f4f6a9
..
b33c354
100644
(file)
--- a/
include/asm-sparc/pgtable.h
+++ b/
include/asm-sparc/pgtable.h
@@
-82,6
+82,8
@@
extern unsigned long page_kernel;
/* Top-level page directory */
extern pgd_t swapper_pg_dir[1024];
/* Top-level page directory */
extern pgd_t swapper_pg_dir[1024];
+extern void paging_init(void);
+
/* Page table for 0-4MB for everybody, on the Sparc this
* holds the same as on the i386.
*/
/* Page table for 0-4MB for everybody, on the Sparc this
* holds the same as on the i386.
*/
@@
-152,7
+154,7
@@
BTFIXUPDEF_CALL_CONST(int, pte_present, pte_t)
BTFIXUPDEF_CALL(void, pte_clear, pte_t *)
BTFIXUPDEF_CALL(int, pte_read, pte_t)
BTFIXUPDEF_CALL(void, pte_clear, pte_t *)
BTFIXUPDEF_CALL(int, pte_read, pte_t)
-
extern __inline__
int pte_none(pte_t pte)
+
static inline
int pte_none(pte_t pte)
{
return !(pte_val(pte) & ~BTFIXUP_SETHI(none_mask));
}
{
return !(pte_val(pte) & ~BTFIXUP_SETHI(none_mask));
}
@@
-165,7
+167,7
@@
BTFIXUPDEF_CALL_CONST(int, pmd_bad, pmd_t)
BTFIXUPDEF_CALL_CONST(int, pmd_present, pmd_t)
BTFIXUPDEF_CALL(void, pmd_clear, pmd_t *)
BTFIXUPDEF_CALL_CONST(int, pmd_present, pmd_t)
BTFIXUPDEF_CALL(void, pmd_clear, pmd_t *)
-
extern __inline__
int pmd_none(pmd_t pmd)
+
static inline
int pmd_none(pmd_t pmd)
{
return !(pmd_val(pmd) & ~BTFIXUP_SETHI(none_mask));
}
{
return !(pmd_val(pmd) & ~BTFIXUP_SETHI(none_mask));
}
@@
-192,20
+194,20
@@
BTFIXUPDEF_HALF(pte_writei)
BTFIXUPDEF_HALF(pte_dirtyi)
BTFIXUPDEF_HALF(pte_youngi)
BTFIXUPDEF_HALF(pte_dirtyi)
BTFIXUPDEF_HALF(pte_youngi)
-
extern
int pte_write(pte_t pte) __attribute_const__;
-
extern __inline__
int pte_write(pte_t pte)
+
static
int pte_write(pte_t pte) __attribute_const__;
+
static inline
int pte_write(pte_t pte)
{
return pte_val(pte) & BTFIXUP_HALF(pte_writei);
}
{
return pte_val(pte) & BTFIXUP_HALF(pte_writei);
}
-
extern
int pte_dirty(pte_t pte) __attribute_const__;
-
extern __inline__
int pte_dirty(pte_t pte)
+
static
int pte_dirty(pte_t pte) __attribute_const__;
+
static inline
int pte_dirty(pte_t pte)
{
return pte_val(pte) & BTFIXUP_HALF(pte_dirtyi);
}
{
return pte_val(pte) & BTFIXUP_HALF(pte_dirtyi);
}
-
extern
int pte_young(pte_t pte) __attribute_const__;
-
extern __inline__
int pte_young(pte_t pte)
+
static
int pte_young(pte_t pte) __attribute_const__;
+
static inline
int pte_young(pte_t pte)
{
return pte_val(pte) & BTFIXUP_HALF(pte_youngi);
}
{
return pte_val(pte) & BTFIXUP_HALF(pte_youngi);
}
@@
-215,8
+217,8
@@
extern __inline__ int pte_young(pte_t pte)
*/
BTFIXUPDEF_HALF(pte_filei)
*/
BTFIXUPDEF_HALF(pte_filei)
-
extern
int pte_file(pte_t pte) __attribute_const__;
-
extern __inline__
int pte_file(pte_t pte)
+
static
int pte_file(pte_t pte) __attribute_const__;
+
static inline
int pte_file(pte_t pte)
{
return pte_val(pte) & BTFIXUP_HALF(pte_filei);
}
{
return pte_val(pte) & BTFIXUP_HALF(pte_filei);
}
@@
-227,20
+229,20
@@
BTFIXUPDEF_HALF(pte_wrprotecti)
BTFIXUPDEF_HALF(pte_mkcleani)
BTFIXUPDEF_HALF(pte_mkoldi)
BTFIXUPDEF_HALF(pte_mkcleani)
BTFIXUPDEF_HALF(pte_mkoldi)
-
extern
pte_t pte_wrprotect(pte_t pte) __attribute_const__;
-
extern __inline__
pte_t pte_wrprotect(pte_t pte)
+
static
pte_t pte_wrprotect(pte_t pte) __attribute_const__;
+
static inline
pte_t pte_wrprotect(pte_t pte)
{
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_wrprotecti));
}
{
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_wrprotecti));
}
-
extern
pte_t pte_mkclean(pte_t pte) __attribute_const__;
-
extern __inline__
pte_t pte_mkclean(pte_t pte)
+
static
pte_t pte_mkclean(pte_t pte) __attribute_const__;
+
static inline
pte_t pte_mkclean(pte_t pte)
{
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkcleani));
}
{
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkcleani));
}
-
extern
pte_t pte_mkold(pte_t pte) __attribute_const__;
-
extern __inline__
pte_t pte_mkold(pte_t pte)
+
static
pte_t pte_mkold(pte_t pte) __attribute_const__;
+
static inline
pte_t pte_mkold(pte_t pte)
{
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkoldi));
}
{
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkoldi));
}
@@
-253,8
+255,6
@@
BTFIXUPDEF_CALL_CONST(pte_t, pte_mkyoung, pte_t)
#define pte_mkdirty(pte) BTFIXUP_CALL(pte_mkdirty)(pte)
#define pte_mkyoung(pte) BTFIXUP_CALL(pte_mkyoung)(pte)
#define pte_mkdirty(pte) BTFIXUP_CALL(pte_mkdirty)(pte)
#define pte_mkyoung(pte) BTFIXUP_CALL(pte_mkyoung)(pte)
-#define page_pte_prot(page, prot) mk_pte(page, prot)
-#define page_pte(page) mk_pte(page, __pgprot(0))
#define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot)
BTFIXUPDEF_CALL(unsigned long, pte_pfn, pte_t)
#define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot)
BTFIXUPDEF_CALL(unsigned long, pte_pfn, pte_t)
@@
-276,8
+276,8
@@
BTFIXUPDEF_CALL_CONST(pte_t, mk_pte_io, unsigned long, pgprot_t, int)
BTFIXUPDEF_INT(pte_modify_mask)
BTFIXUPDEF_INT(pte_modify_mask)
-
extern
pte_t pte_modify(pte_t pte, pgprot_t newprot) __attribute_const__;
-
extern __inline__
pte_t pte_modify(pte_t pte, pgprot_t newprot)
+
static
pte_t pte_modify(pte_t pte, pgprot_t newprot) __attribute_const__;
+
static inline
pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
return __pte((pte_val(pte) & BTFIXUP_INT(pte_modify_mask)) |
pgprot_val(newprot));
{
return __pte((pte_val(pte) & BTFIXUP_INT(pte_modify_mask)) |
pgprot_val(newprot));
@@
-384,13
+384,13
@@
extern struct ctx_list ctx_used; /* Head of used contexts list */
#define NO_CONTEXT -1
#define NO_CONTEXT -1
-
extern __inline__
void remove_from_ctx_list(struct ctx_list *entry)
+
static inline
void remove_from_ctx_list(struct ctx_list *entry)
{
entry->next->prev = entry->prev;
entry->prev->next = entry->next;
}
{
entry->next->prev = entry->prev;
entry->prev->next = entry->next;
}
-
extern __inline__
void add_to_ctx_list(struct ctx_list *head, struct ctx_list *entry)
+
static inline
void add_to_ctx_list(struct ctx_list *head, struct ctx_list *entry)
{
entry->next = head;
(entry->prev = head->prev)->next = entry;
{
entry->next = head;
(entry->prev = head->prev)->next = entry;
@@
-399,7
+399,7
@@
extern __inline__ void add_to_ctx_list(struct ctx_list *head, struct ctx_list *e
#define add_to_free_ctxlist(entry) add_to_ctx_list(&ctx_free, entry)
#define add_to_used_ctxlist(entry) add_to_ctx_list(&ctx_used, entry)
#define add_to_free_ctxlist(entry) add_to_ctx_list(&ctx_free, entry)
#define add_to_used_ctxlist(entry) add_to_ctx_list(&ctx_used, entry)
-
extern __inline__
unsigned long
+
static inline
unsigned long
__get_phys (unsigned long addr)
{
switch (sparc_cpu_model){
__get_phys (unsigned long addr)
{
switch (sparc_cpu_model){
@@
-414,7
+414,7
@@
__get_phys (unsigned long addr)
}
}
}
}
-
extern __inline__
int
+
static inline
int
__get_iospace (unsigned long addr)
{
switch (sparc_cpu_model){
__get_iospace (unsigned long addr)
{
switch (sparc_cpu_model){