diff -Naur -X exclude-files ac_cur/include/asm-um/mmu_context.h ac/include/asm-um/mmu_context.h
--- ac_cur/include/asm-um/mmu_context.h Sat Sep 15 19:29:16 2001
+++ ac/include/asm-um/mmu_context.h Sat Sep 15 19:47:51 2001
@@ -8,16 +8,16 @@
#define activate_context(tsk) do ; while(0)
#define destroy_context(mm) do ; while(0)
-extern inline void activate_mm(struct mm_struct *old, struct mm_struct *new)
+static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)
{
}
-extern inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
struct task_struct *tsk, unsigned cpu)
{
}
-extern inline void enter_lazy_tlb(struct mm_struct *mm,
+static inline void enter_lazy_tlb(struct mm_struct *mm,
struct task_struct *tsk, unsigned cpu)
{
}
diff -Naur -X exclude-files ac_cur/include/asm-um/pgalloc.h ac/include/asm-um/pgalloc.h
--- ac_cur/include/asm-um/pgalloc.h Sat Sep 15 19:29:18 2001
+++ ac/include/asm-um/pgalloc.h Sat Sep 15 19:47:53 2001
@@ -125,7 +125,7 @@
unsigned long end);
extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr);
-extern inline void flush_tlb_pgtables(struct mm_struct *mm,
+static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
{
}
diff -Naur -X exclude-files ac_cur/include/asm-um/pgtable.h ac/include/asm-um/pgtable.h
--- ac_cur/include/asm-um/pgtable.h Sat Sep 15 19:29:16 2001
+++ ac/include/asm-um/pgtable.h Sat Sep 15 19:47:51 2001
@@ -180,10 +180,10 @@
* setup: the pgd is never bad, and a pmd always exists (as it's folded
* into the pgd entry)
*/
-extern inline int pgd_none(pgd_t pgd) { return 0; }
-extern inline int pgd_bad(pgd_t pgd) { return 0; }
-extern inline int pgd_present(pgd_t pgd) { return 1; }
-extern inline void pgd_clear(pgd_t * pgdp) { }
+static inline int pgd_none(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 void pgd_clear(pgd_t * pgdp) { }
/*
@@ -197,19 +197,19 @@
(mem_map+((unsigned long)((__pa(pte_val(x)) >> PAGE_SHIFT))))
#define pte_address(x) ((void *) ((unsigned long) pte_val(x) & PAGE_MASK))
-extern inline pte_t pte_mknewprot(pte_t pte)
+static inline pte_t pte_mknewprot(pte_t pte)
{
pte_val(pte) |= _PAGE_NEWPROT;
return(pte);
}
-extern inline pte_t pte_mknewpage(pte_t pte)
+static inline pte_t pte_mknewpage(pte_t pte)
{
pte_val(pte) |= _PAGE_NEWPAGE;
return(pte);
}
-extern inline void set_pte(pte_t *pteptr, pte_t pteval)
+static inline void set_pte(pte_t *pteptr, pte_t pteval)
{
*pteptr = pteval;
if(pte_present(*pteptr))
@@ -227,75 +227,75 @@
* The following only work if pte_present() is true.
* Undefined behaviour if not..
*/
-extern inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
-extern inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
-extern inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
-extern inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; }
-extern inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; }
-extern inline int pte_newpage(pte_t pte) { return pte_val(pte) & _PAGE_NEWPAGE; }
-extern inline int pte_newprot(pte_t pte) { return pte_val(pte) & _PAGE_NEWPROT; }
+static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
+static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
+static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
+static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; }
+static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; }
+static inline int pte_newpage(pte_t pte) { return pte_val(pte) & _PAGE_NEWPAGE; }
+static inline int pte_newprot(pte_t pte) { return pte_val(pte) & _PAGE_NEWPROT; }
-extern inline pte_t pte_rdprotect(pte_t pte)
+static inline pte_t pte_rdprotect(pte_t pte)
{
pte_val(pte) &= ~_PAGE_USER;
return(pte_mknewprot(pte));
}
-extern inline pte_t pte_exprotect(pte_t pte)
+static inline pte_t pte_exprotect(pte_t pte)
{
pte_val(pte) &= ~_PAGE_USER;
return(pte_mknewprot(pte));
}
-extern inline pte_t pte_mkclean(pte_t pte)
+static inline pte_t pte_mkclean(pte_t pte)
{
pte_val(pte) &= ~_PAGE_DIRTY;
return(pte);
}
-extern inline pte_t pte_mkold(pte_t pte)
+static inline pte_t pte_mkold(pte_t pte)
{
pte_val(pte) &= ~_PAGE_ACCESSED;
return(pte);
}
-extern inline pte_t pte_wrprotect(pte_t pte)
+static inline pte_t pte_wrprotect(pte_t pte)
{
pte_val(pte) &= ~_PAGE_RW;
return(pte_mknewprot(pte));
}
-extern inline pte_t pte_mkread(pte_t pte)
+static inline pte_t pte_mkread(pte_t pte)
{
pte_val(pte) |= _PAGE_USER;
return(pte_mknewprot(pte));
}
-extern inline pte_t pte_mkexec(pte_t pte)
+static inline pte_t pte_mkexec(pte_t pte)
{
pte_val(pte) |= _PAGE_USER;
return(pte_mknewprot(pte));
}
-extern inline pte_t pte_mkdirty(pte_t pte)
+static inline pte_t pte_mkdirty(pte_t pte)
{
pte_val(pte) |= _PAGE_DIRTY;
return(pte);
}
-extern inline pte_t pte_mkyoung(pte_t pte)
+static inline pte_t pte_mkyoung(pte_t pte)
{
pte_val(pte) |= _PAGE_ACCESSED;
return(pte);
}
-extern inline pte_t pte_mkwrite(pte_t pte)
+static inline pte_t pte_mkwrite(pte_t pte)
{
pte_val(pte) |= _PAGE_RW;
return(pte_mknewprot(pte));
}
-extern inline pte_t pte_mkuptodate(pte_t pte)
+static inline pte_t pte_mkuptodate(pte_t pte)
{
pte_val(pte) &= ~(_PAGE_NEWPROT | _PAGE_NEWPAGE);
return(pte);
@@ -319,7 +319,7 @@
#define mk_pte_phys(physpage, pgprot) \
({ pte_t __pte; pte_val(__pte) = physpage + pgprot_val(pgprot); __pte; })
-extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot);
if(pte_present(pte)) pte = pte_mknewpage(pte_mknewprot(pte));
@@ -340,7 +340,7 @@
#define pgd_offset_k(address) pgd_offset(&init_mm, address)
/* Find an entry in the second-level page table.. */
-extern 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;
}
diff -Naur -X exclude-files ac_cur/include/asm-um/processor-generic.h ac/include/asm-um/processor-generic.h
--- ac_cur/include/asm-um/processor-generic.h Sat Sep 15 19:29:16 2001
+++ ac/include/asm-um/processor-generic.h Sat Sep 15 19:47:50 2001
@@ -175,11 +175,11 @@
extern void release_thread(struct task_struct *);
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-extern inline void release_segments(struct mm_struct *mm)
+static inline void release_segments(struct mm_struct *mm)
{
}
-extern inline void copy_segments(struct task_struct *p,
+static inline void copy_segments(struct task_struct *p,
struct mm_struct *new_mm)
{
}
diff -Naur -X exclude-files ac_cur/include/asm-um/unistd.h ac/include/asm-um/unistd.h
--- ac_cur/include/asm-um/unistd.h Sat Sep 15 19:29:18 2001
+++ ac/include/asm-um/unistd.h Sat Sep 15 19:47:53 2001
@@ -32,38 +32,38 @@
set_fs(fs); \
return ret;
-extern inline long open(const char *pathname, int flags, int mode)
+static inline long open(const char *pathname, int flags, int mode)
{
KERNEL_CALL(int, sys_open, pathname, flags, mode)
}
-extern inline long dup(unsigned int fd)
+static inline long dup(unsigned int fd)
{
KERNEL_CALL(int, sys_dup, fd);
}
-extern inline long close(unsigned int fd)
+static inline long close(unsigned int fd)
{
KERNEL_CALL(int, sys_close, fd);
}
-extern inline int execve(const char *filename, char *const argv[],
+static inline int execve(const char *filename, char *const argv[],
char *const envp[])
{
return um_execve(filename, argv, envp);
}
-extern inline long waitpid(pid_t pid, unsigned int *status, int options)
+static inline long waitpid(pid_t pid, unsigned int *status, int options)
{
KERNEL_CALL(pid_t, sys_wait4, pid, status, options, NULL)
}
-extern inline pid_t wait(int *status)
+static inline pid_t wait(int *status)
{
KERNEL_CALL(pid_t, sys_wait4, -1, status, 0, NULL)
}
-extern inline pid_t setsid(void)
+static inline pid_t setsid(void)
{
KERNEL_CALL(pid_t, sys_setsid)
}