Commit 4448aaf0 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] s390: "extern inline" -> "static inline"

"extern inline" -> "static inline"
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0fbeb5a4
...@@ -871,7 +871,7 @@ by playing with the --adjust-vma parameter to objdump. ...@@ -871,7 +871,7 @@ by playing with the --adjust-vma parameter to objdump.
extern inline void spin_lock(spinlock_t *lp) static inline void spin_lock(spinlock_t *lp)
{ {
a0: 18 34 lr %r3,%r4 a0: 18 34 lr %r3,%r4
a2: a7 3a 03 bc ahi %r3,956 a2: a7 3a 03 bc ahi %r3,956
......
...@@ -486,7 +486,7 @@ debug_format_entry(file_private_info_t *p_info) ...@@ -486,7 +486,7 @@ debug_format_entry(file_private_info_t *p_info)
* - goto next entry in p_info * - goto next entry in p_info
*/ */
extern inline int static inline int
debug_next_entry(file_private_info_t *p_info) debug_next_entry(file_private_info_t *p_info)
{ {
debug_info_t *id; debug_info_t *id;
...@@ -800,7 +800,7 @@ debug_set_level(debug_info_t* id, int new_level) ...@@ -800,7 +800,7 @@ debug_set_level(debug_info_t* id, int new_level)
* - set active entry to next in the ring buffer * - set active entry to next in the ring buffer
*/ */
extern inline void static inline void
proceed_active_entry(debug_info_t * id) proceed_active_entry(debug_info_t * id)
{ {
if ((id->active_entries[id->active_area] += id->entry_size) if ((id->active_entries[id->active_area] += id->entry_size)
...@@ -817,7 +817,7 @@ proceed_active_entry(debug_info_t * id) ...@@ -817,7 +817,7 @@ proceed_active_entry(debug_info_t * id)
* - set active area to next in the ring buffer * - set active area to next in the ring buffer
*/ */
extern inline void static inline void
proceed_active_area(debug_info_t * id) proceed_active_area(debug_info_t * id)
{ {
id->active_area++; id->active_area++;
...@@ -828,7 +828,7 @@ proceed_active_area(debug_info_t * id) ...@@ -828,7 +828,7 @@ proceed_active_area(debug_info_t * id)
* get_active_entry: * get_active_entry:
*/ */
extern inline debug_entry_t* static inline debug_entry_t*
get_active_entry(debug_info_t * id) get_active_entry(debug_info_t * id)
{ {
return (debug_entry_t *) (((char *) id->areas[id->active_area] return (debug_entry_t *) (((char *) id->areas[id->active_area]
...@@ -841,7 +841,7 @@ get_active_entry(debug_info_t * id) ...@@ -841,7 +841,7 @@ get_active_entry(debug_info_t * id)
* - set timestamp, caller address, cpu number etc. * - set timestamp, caller address, cpu number etc.
*/ */
extern inline void static inline void
debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level, debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level,
int exception) int exception)
{ {
...@@ -971,7 +971,7 @@ debug_entry_t ...@@ -971,7 +971,7 @@ debug_entry_t
* counts arguments in format string for sprintf view * counts arguments in format string for sprintf view
*/ */
extern inline int static inline int
debug_count_numargs(char *string) debug_count_numargs(char *string)
{ {
int numargs=0; int numargs=0;
......
...@@ -160,7 +160,7 @@ static void do_sigsegv(struct pt_regs *regs, unsigned long error_code, ...@@ -160,7 +160,7 @@ static void do_sigsegv(struct pt_regs *regs, unsigned long error_code,
* 11 Page translation -> Not present (nullification) * 11 Page translation -> Not present (nullification)
* 3b Region third trans. -> Not present (nullification) * 3b Region third trans. -> Not present (nullification)
*/ */
extern inline void static inline void
do_exception(struct pt_regs *regs, unsigned long error_code, int is_protection) do_exception(struct pt_regs *regs, unsigned long error_code, int is_protection)
{ {
struct task_struct *tsk; struct task_struct *tsk;
......
...@@ -41,14 +41,14 @@ int kbd_ioctl(struct kbd_data *, struct file *, unsigned int, unsigned long); ...@@ -41,14 +41,14 @@ int kbd_ioctl(struct kbd_data *, struct file *, unsigned int, unsigned long);
/* /*
* Helper Functions. * Helper Functions.
*/ */
extern inline void static inline void
kbd_put_queue(struct tty_struct *tty, int ch) kbd_put_queue(struct tty_struct *tty, int ch)
{ {
tty_insert_flip_char(tty, ch, 0); tty_insert_flip_char(tty, ch, 0);
tty_schedule_flip(tty); tty_schedule_flip(tty);
} }
extern inline void static inline void
kbd_puts_queue(struct tty_struct *tty, char *cp) kbd_puts_queue(struct tty_struct *tty, char *cp)
{ {
while (*cp) while (*cp)
......
...@@ -265,7 +265,7 @@ QDIO_PRINT_##importance(header "%02x %02x %02x %02x %02x %02x %02x %02x " \ ...@@ -265,7 +265,7 @@ QDIO_PRINT_##importance(header "%02x %02x %02x %02x %02x %02x %02x %02x " \
/* /*
* Some instructions as assembly * Some instructions as assembly
*/ */
extern __inline__ int static inline int
do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2) do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2)
{ {
int cc; int cc;
...@@ -300,7 +300,7 @@ do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2) ...@@ -300,7 +300,7 @@ do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2)
return cc; return cc;
} }
extern __inline__ int static inline int
do_siga_input(unsigned int irq, unsigned int mask) do_siga_input(unsigned int irq, unsigned int mask)
{ {
int cc; int cc;
...@@ -334,7 +334,7 @@ do_siga_input(unsigned int irq, unsigned int mask) ...@@ -334,7 +334,7 @@ do_siga_input(unsigned int irq, unsigned int mask)
return cc; return cc;
} }
extern __inline__ int static inline int
do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb) do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb)
{ {
int cc; int cc;
...@@ -401,7 +401,7 @@ do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb) ...@@ -401,7 +401,7 @@ do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb)
return cc; return cc;
} }
extern __inline__ unsigned long static inline unsigned long
do_clear_global_summary(void) do_clear_global_summary(void)
{ {
......
...@@ -140,7 +140,7 @@ fsm_record_history(fsm_instance *fi, int state, int event); ...@@ -140,7 +140,7 @@ fsm_record_history(fsm_instance *fi, int state, int event);
* 1 if current state or event is out of range * 1 if current state or event is out of range
* !0 if state and event in range, but no action defined. * !0 if state and event in range, but no action defined.
*/ */
extern __inline__ int static inline int
fsm_event(fsm_instance *fi, int event, void *arg) fsm_event(fsm_instance *fi, int event, void *arg)
{ {
fsm_function_t r; fsm_function_t r;
...@@ -188,7 +188,7 @@ fsm_event(fsm_instance *fi, int event, void *arg) ...@@ -188,7 +188,7 @@ fsm_event(fsm_instance *fi, int event, void *arg)
* @param fi Pointer to FSM * @param fi Pointer to FSM
* @param state The new state for this FSM. * @param state The new state for this FSM.
*/ */
extern __inline__ void static inline void
fsm_newstate(fsm_instance *fi, int newstate) fsm_newstate(fsm_instance *fi, int newstate)
{ {
atomic_set(&fi->state,newstate); atomic_set(&fi->state,newstate);
...@@ -208,7 +208,7 @@ fsm_newstate(fsm_instance *fi, int newstate) ...@@ -208,7 +208,7 @@ fsm_newstate(fsm_instance *fi, int newstate)
* *
* @return The current state of the FSM. * @return The current state of the FSM.
*/ */
extern __inline__ int static inline int
fsm_getstate(fsm_instance *fi) fsm_getstate(fsm_instance *fi)
{ {
return atomic_read(&fi->state); return atomic_read(&fi->state);
......
...@@ -88,7 +88,7 @@ struct crw { ...@@ -88,7 +88,7 @@ struct crw {
#define CRW_ERC_PERRI 0x07 /* perm. error, facility init */ #define CRW_ERC_PERRI 0x07 /* perm. error, facility init */
#define CRW_ERC_PMOD 0x08 /* installed parameters modified */ #define CRW_ERC_PMOD 0x08 /* installed parameters modified */
extern __inline__ int stcrw(struct crw *pcrw ) static inline int stcrw(struct crw *pcrw )
{ {
int ccode; int ccode;
......
...@@ -129,7 +129,7 @@ void debug_set_level(debug_info_t* id, int new_level); ...@@ -129,7 +129,7 @@ void debug_set_level(debug_info_t* id, int new_level);
void debug_stop_all(void); void debug_stop_all(void);
extern inline debug_entry_t* static inline debug_entry_t*
debug_event(debug_info_t* id, int level, void* data, int length) debug_event(debug_info_t* id, int level, void* data, int length)
{ {
if ((!id) || (level > id->level) || (id->pages_per_area == 0)) if ((!id) || (level > id->level) || (id->pages_per_area == 0))
...@@ -137,7 +137,7 @@ debug_event(debug_info_t* id, int level, void* data, int length) ...@@ -137,7 +137,7 @@ debug_event(debug_info_t* id, int level, void* data, int length)
return debug_event_common(id,level,data,length); return debug_event_common(id,level,data,length);
} }
extern inline debug_entry_t* static inline debug_entry_t*
debug_int_event(debug_info_t* id, int level, unsigned int tag) debug_int_event(debug_info_t* id, int level, unsigned int tag)
{ {
unsigned int t=tag; unsigned int t=tag;
...@@ -146,7 +146,7 @@ debug_int_event(debug_info_t* id, int level, unsigned int tag) ...@@ -146,7 +146,7 @@ debug_int_event(debug_info_t* id, int level, unsigned int tag)
return debug_event_common(id,level,&t,sizeof(unsigned int)); return debug_event_common(id,level,&t,sizeof(unsigned int));
} }
extern inline debug_entry_t * static inline debug_entry_t *
debug_long_event (debug_info_t* id, int level, unsigned long tag) debug_long_event (debug_info_t* id, int level, unsigned long tag)
{ {
unsigned long t=tag; unsigned long t=tag;
...@@ -155,7 +155,7 @@ debug_long_event (debug_info_t* id, int level, unsigned long tag) ...@@ -155,7 +155,7 @@ debug_long_event (debug_info_t* id, int level, unsigned long tag)
return debug_event_common(id,level,&t,sizeof(unsigned long)); return debug_event_common(id,level,&t,sizeof(unsigned long));
} }
extern inline debug_entry_t* static inline debug_entry_t*
debug_text_event(debug_info_t* id, int level, const char* txt) debug_text_event(debug_info_t* id, int level, const char* txt)
{ {
if ((!id) || (level > id->level) || (id->pages_per_area == 0)) if ((!id) || (level > id->level) || (id->pages_per_area == 0))
...@@ -168,7 +168,7 @@ debug_sprintf_event(debug_info_t* id,int level,char *string,...) ...@@ -168,7 +168,7 @@ debug_sprintf_event(debug_info_t* id,int level,char *string,...)
__attribute__ ((format(printf, 3, 4))); __attribute__ ((format(printf, 3, 4)));
extern inline debug_entry_t* static inline debug_entry_t*
debug_exception(debug_info_t* id, int level, void* data, int length) debug_exception(debug_info_t* id, int level, void* data, int length)
{ {
if ((!id) || (level > id->level) || (id->pages_per_area == 0)) if ((!id) || (level > id->level) || (id->pages_per_area == 0))
...@@ -176,7 +176,7 @@ debug_exception(debug_info_t* id, int level, void* data, int length) ...@@ -176,7 +176,7 @@ debug_exception(debug_info_t* id, int level, void* data, int length)
return debug_exception_common(id,level,data,length); return debug_exception_common(id,level,data,length);
} }
extern inline debug_entry_t* static inline debug_entry_t*
debug_int_exception(debug_info_t* id, int level, unsigned int tag) debug_int_exception(debug_info_t* id, int level, unsigned int tag)
{ {
unsigned int t=tag; unsigned int t=tag;
...@@ -185,7 +185,7 @@ debug_int_exception(debug_info_t* id, int level, unsigned int tag) ...@@ -185,7 +185,7 @@ debug_int_exception(debug_info_t* id, int level, unsigned int tag)
return debug_exception_common(id,level,&t,sizeof(unsigned int)); return debug_exception_common(id,level,&t,sizeof(unsigned int));
} }
extern inline debug_entry_t * static inline debug_entry_t *
debug_long_exception (debug_info_t* id, int level, unsigned long tag) debug_long_exception (debug_info_t* id, int level, unsigned long tag)
{ {
unsigned long t=tag; unsigned long t=tag;
...@@ -194,7 +194,7 @@ debug_long_exception (debug_info_t* id, int level, unsigned long tag) ...@@ -194,7 +194,7 @@ debug_long_exception (debug_info_t* id, int level, unsigned long tag)
return debug_exception_common(id,level,&t,sizeof(unsigned long)); return debug_exception_common(id,level,&t,sizeof(unsigned long));
} }
extern inline debug_entry_t* static inline debug_entry_t*
debug_text_exception(debug_info_t* id, int level, const char* txt) debug_text_exception(debug_info_t* id, int level, const char* txt)
{ {
if ((!id) || (level > id->level) || (id->pages_per_area == 0)) if ((!id) || (level > id->level) || (id->pages_per_area == 0))
......
...@@ -21,7 +21,7 @@ extern __u8 _ebcasc[]; /* EBCDIC -> ASCII conversion table */ ...@@ -21,7 +21,7 @@ extern __u8 _ebcasc[]; /* EBCDIC -> ASCII conversion table */
extern __u8 _ebc_tolower[]; /* EBCDIC -> lowercase */ extern __u8 _ebc_tolower[]; /* EBCDIC -> lowercase */
extern __u8 _ebc_toupper[]; /* EBCDIC -> uppercase */ extern __u8 _ebc_toupper[]; /* EBCDIC -> uppercase */
extern __inline__ void static inline void
codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr) codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)
{ {
if (nr-- <= 0) if (nr-- <= 0)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* Change virtual addresses to physical addresses and vv. * Change virtual addresses to physical addresses and vv.
* These are pretty trivial * These are pretty trivial
*/ */
extern inline unsigned long virt_to_phys(volatile void * address) static inline unsigned long virt_to_phys(volatile void * address)
{ {
unsigned long real_address; unsigned long real_address;
__asm__ ( __asm__ (
...@@ -42,7 +42,7 @@ extern inline unsigned long virt_to_phys(volatile void * address) ...@@ -42,7 +42,7 @@ extern inline unsigned long virt_to_phys(volatile void * address)
return real_address; return real_address;
} }
extern inline void * phys_to_virt(unsigned long address) static inline void * phys_to_virt(unsigned long address)
{ {
return __io_virt(address); return __io_virt(address);
} }
...@@ -54,7 +54,7 @@ extern inline void * phys_to_virt(unsigned long address) ...@@ -54,7 +54,7 @@ extern inline void * phys_to_virt(unsigned long address)
extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
extern inline void * ioremap (unsigned long offset, unsigned long size) static inline void * ioremap (unsigned long offset, unsigned long size)
{ {
return __ioremap(offset, size, 0); return __ioremap(offset, size, 0);
} }
...@@ -64,7 +64,7 @@ extern inline void * ioremap (unsigned long offset, unsigned long size) ...@@ -64,7 +64,7 @@ extern inline void * ioremap (unsigned long offset, unsigned long size)
* it's useful if some control registers are in such an area and write combining * it's useful if some control registers are in such an area and write combining
* or read caching is not desirable: * or read caching is not desirable:
*/ */
extern inline void * ioremap_nocache (unsigned long offset, unsigned long size) static inline void * ioremap_nocache (unsigned long offset, unsigned long size)
{ {
return __ioremap(offset, size, 0); return __ioremap(offset, size, 0);
} }
......
...@@ -346,7 +346,7 @@ struct _lowcore ...@@ -346,7 +346,7 @@ struct _lowcore
#define S390_lowcore (*((struct _lowcore *) 0)) #define S390_lowcore (*((struct _lowcore *) 0))
extern struct _lowcore *lowcore_ptr[]; extern struct _lowcore *lowcore_ptr[];
extern __inline__ void set_prefix(__u32 address) static inline void set_prefix(__u32 address)
{ {
__asm__ __volatile__ ("spx %0" : : "m" (address) : "memory" ); __asm__ __volatile__ ("spx %0" : : "m" (address) : "memory" );
} }
......
...@@ -44,7 +44,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, ...@@ -44,7 +44,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
#define deactivate_mm(tsk,mm) do { } while (0) #define deactivate_mm(tsk,mm) do { } while (0)
extern inline void activate_mm(struct mm_struct *prev, static inline void activate_mm(struct mm_struct *prev,
struct mm_struct *next) struct mm_struct *next)
{ {
switch_mm(prev, next, current); switch_mm(prev, next, current);
......
...@@ -319,7 +319,7 @@ extern char empty_zero_page[PAGE_SIZE]; ...@@ -319,7 +319,7 @@ extern char empty_zero_page[PAGE_SIZE];
* within a page table are directly modified. Thus, the following * within a page table are directly modified. Thus, the following
* hook is made available. * hook is made available.
*/ */
extern inline void set_pte(pte_t *pteptr, pte_t pteval) static inline void set_pte(pte_t *pteptr, pte_t pteval)
{ {
*pteptr = pteval; *pteptr = pteval;
} }
...@@ -330,63 +330,63 @@ extern inline void set_pte(pte_t *pteptr, pte_t pteval) ...@@ -330,63 +330,63 @@ extern inline void set_pte(pte_t *pteptr, pte_t pteval)
*/ */
#ifndef __s390x__ #ifndef __s390x__
extern inline int pgd_present(pgd_t pgd) { return 1; } static inline int pgd_present(pgd_t pgd) { return 1; }
extern inline int pgd_none(pgd_t pgd) { return 0; } static inline int pgd_none(pgd_t pgd) { return 0; }
extern inline int pgd_bad(pgd_t pgd) { return 0; } static inline int pgd_bad(pgd_t pgd) { return 0; }
extern inline int pmd_present(pmd_t pmd) { return pmd_val(pmd) & _SEG_PRESENT; } static inline int pmd_present(pmd_t pmd) { return pmd_val(pmd) & _SEG_PRESENT; }
extern inline int pmd_none(pmd_t pmd) { return pmd_val(pmd) & _PAGE_TABLE_INV; } static inline int pmd_none(pmd_t pmd) { return pmd_val(pmd) & _PAGE_TABLE_INV; }
extern inline int pmd_bad(pmd_t pmd) static inline int pmd_bad(pmd_t pmd)
{ {
return (pmd_val(pmd) & (~PAGE_MASK & ~_PAGE_TABLE_INV)) != _PAGE_TABLE; return (pmd_val(pmd) & (~PAGE_MASK & ~_PAGE_TABLE_INV)) != _PAGE_TABLE;
} }
#else /* __s390x__ */ #else /* __s390x__ */
extern inline int pgd_present(pgd_t pgd) static inline int pgd_present(pgd_t pgd)
{ {
return (pgd_val(pgd) & ~PAGE_MASK) == _PGD_ENTRY; return (pgd_val(pgd) & ~PAGE_MASK) == _PGD_ENTRY;
} }
extern inline int pgd_none(pgd_t pgd) static inline int pgd_none(pgd_t pgd)
{ {
return pgd_val(pgd) & _PGD_ENTRY_INV; return pgd_val(pgd) & _PGD_ENTRY_INV;
} }
extern inline int pgd_bad(pgd_t pgd) static inline int pgd_bad(pgd_t pgd)
{ {
return (pgd_val(pgd) & (~PAGE_MASK & ~_PGD_ENTRY_INV)) != _PGD_ENTRY; return (pgd_val(pgd) & (~PAGE_MASK & ~_PGD_ENTRY_INV)) != _PGD_ENTRY;
} }
extern inline int pmd_present(pmd_t pmd) static inline int pmd_present(pmd_t pmd)
{ {
return (pmd_val(pmd) & ~PAGE_MASK) == _PMD_ENTRY; return (pmd_val(pmd) & ~PAGE_MASK) == _PMD_ENTRY;
} }
extern inline int pmd_none(pmd_t pmd) static inline int pmd_none(pmd_t pmd)
{ {
return pmd_val(pmd) & _PMD_ENTRY_INV; return pmd_val(pmd) & _PMD_ENTRY_INV;
} }
extern inline int pmd_bad(pmd_t pmd) static inline int pmd_bad(pmd_t pmd)
{ {
return (pmd_val(pmd) & (~PAGE_MASK & ~_PMD_ENTRY_INV)) != _PMD_ENTRY; return (pmd_val(pmd) & (~PAGE_MASK & ~_PMD_ENTRY_INV)) != _PMD_ENTRY;
} }
#endif /* __s390x__ */ #endif /* __s390x__ */
extern inline int pte_none(pte_t pte) static inline int pte_none(pte_t pte)
{ {
return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_EMPTY; return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_EMPTY;
} }
extern inline int pte_present(pte_t pte) static inline int pte_present(pte_t pte)
{ {
return !(pte_val(pte) & _PAGE_INVALID) || return !(pte_val(pte) & _PAGE_INVALID) ||
(pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_NONE; (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_NONE;
} }
extern inline int pte_file(pte_t pte) static inline int pte_file(pte_t pte)
{ {
return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_FILE; return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_FILE;
} }
...@@ -397,12 +397,12 @@ extern inline int pte_file(pte_t pte) ...@@ -397,12 +397,12 @@ extern inline int pte_file(pte_t pte)
* query functions pte_write/pte_dirty/pte_young only work if * query functions pte_write/pte_dirty/pte_young only work if
* pte_present() is true. Undefined behaviour if not.. * pte_present() is true. Undefined behaviour if not..
*/ */
extern inline int pte_write(pte_t pte) static inline int pte_write(pte_t pte)
{ {
return (pte_val(pte) & _PAGE_RO) == 0; return (pte_val(pte) & _PAGE_RO) == 0;
} }
extern inline int pte_dirty(pte_t pte) static inline int pte_dirty(pte_t pte)
{ {
/* A pte is neither clean nor dirty on s/390. The dirty bit /* A pte is neither clean nor dirty on s/390. The dirty bit
* is in the storage key. See page_test_and_clear_dirty for * is in the storage key. See page_test_and_clear_dirty for
...@@ -411,7 +411,7 @@ extern inline int pte_dirty(pte_t pte) ...@@ -411,7 +411,7 @@ extern inline int pte_dirty(pte_t pte)
return 0; return 0;
} }
extern inline int pte_young(pte_t pte) static inline int pte_young(pte_t pte)
{ {
/* A pte is neither young nor old on s/390. The young bit /* A pte is neither young nor old on s/390. The young bit
* is in the storage key. See page_test_and_clear_young for * is in the storage key. See page_test_and_clear_young for
...@@ -420,7 +420,7 @@ extern inline int pte_young(pte_t pte) ...@@ -420,7 +420,7 @@ extern inline int pte_young(pte_t pte)
return 0; return 0;
} }
extern inline int pte_read(pte_t pte) static inline int pte_read(pte_t pte)
{ {
/* All pages are readable since we don't use the fetch /* All pages are readable since we don't use the fetch
* protection bit in the storage key. * protection bit in the storage key.
...@@ -434,9 +434,9 @@ extern inline int pte_read(pte_t pte) ...@@ -434,9 +434,9 @@ extern inline int pte_read(pte_t pte)
#ifndef __s390x__ #ifndef __s390x__
extern inline void pgd_clear(pgd_t * pgdp) { } static inline void pgd_clear(pgd_t * pgdp) { }
extern inline void pmd_clear(pmd_t * pmdp) static inline void pmd_clear(pmd_t * pmdp)
{ {
pmd_val(pmdp[0]) = _PAGE_TABLE_INV; pmd_val(pmdp[0]) = _PAGE_TABLE_INV;
pmd_val(pmdp[1]) = _PAGE_TABLE_INV; pmd_val(pmdp[1]) = _PAGE_TABLE_INV;
...@@ -446,12 +446,12 @@ extern inline void pmd_clear(pmd_t * pmdp) ...@@ -446,12 +446,12 @@ extern inline void pmd_clear(pmd_t * pmdp)
#else /* __s390x__ */ #else /* __s390x__ */
extern inline void pgd_clear(pgd_t * pgdp) static inline void pgd_clear(pgd_t * pgdp)
{ {
pgd_val(*pgdp) = _PGD_ENTRY_INV | _PGD_ENTRY; pgd_val(*pgdp) = _PGD_ENTRY_INV | _PGD_ENTRY;
} }
extern inline void pmd_clear(pmd_t * pmdp) static inline void pmd_clear(pmd_t * pmdp)
{ {
pmd_val(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY; pmd_val(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY;
pmd_val1(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY; pmd_val1(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY;
...@@ -459,7 +459,7 @@ extern inline void pmd_clear(pmd_t * pmdp) ...@@ -459,7 +459,7 @@ extern inline void pmd_clear(pmd_t * pmdp)
#endif /* __s390x__ */ #endif /* __s390x__ */
extern inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{ {
pte_val(*ptep) = _PAGE_INVALID_EMPTY; pte_val(*ptep) = _PAGE_INVALID_EMPTY;
} }
...@@ -468,14 +468,14 @@ extern inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt ...@@ -468,14 +468,14 @@ extern inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
* The following pte modification functions only work if * The following pte modification functions only work if
* pte_present() is true. Undefined behaviour if not.. * pte_present() is true. Undefined behaviour if not..
*/ */
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) &= PAGE_MASK; pte_val(pte) &= PAGE_MASK;
pte_val(pte) |= pgprot_val(newprot); pte_val(pte) |= pgprot_val(newprot);
return pte; return pte;
} }
extern inline pte_t pte_wrprotect(pte_t pte) static inline pte_t pte_wrprotect(pte_t pte)
{ {
/* Do not clobber _PAGE_INVALID_NONE pages! */ /* Do not clobber _PAGE_INVALID_NONE pages! */
if (!(pte_val(pte) & _PAGE_INVALID)) if (!(pte_val(pte) & _PAGE_INVALID))
...@@ -483,13 +483,13 @@ extern inline pte_t pte_wrprotect(pte_t pte) ...@@ -483,13 +483,13 @@ extern inline pte_t pte_wrprotect(pte_t pte)
return pte; return pte;
} }
extern inline pte_t pte_mkwrite(pte_t pte) static inline pte_t pte_mkwrite(pte_t pte)
{ {
pte_val(pte) &= ~_PAGE_RO; pte_val(pte) &= ~_PAGE_RO;
return pte; return pte;
} }
extern inline pte_t pte_mkclean(pte_t pte) static inline pte_t pte_mkclean(pte_t pte)
{ {
/* The only user of pte_mkclean is the fork() code. /* The only user of pte_mkclean is the fork() code.
We must *not* clear the *physical* page dirty bit We must *not* clear the *physical* page dirty bit
...@@ -498,7 +498,7 @@ extern inline pte_t pte_mkclean(pte_t pte) ...@@ -498,7 +498,7 @@ extern inline pte_t pte_mkclean(pte_t pte)
return pte; return pte;
} }
extern inline pte_t pte_mkdirty(pte_t pte) static inline pte_t pte_mkdirty(pte_t pte)
{ {
/* We do not explicitly set the dirty bit because the /* We do not explicitly set the dirty bit because the
* sske instruction is slow. It is faster to let the * sske instruction is slow. It is faster to let the
...@@ -507,7 +507,7 @@ extern inline pte_t pte_mkdirty(pte_t pte) ...@@ -507,7 +507,7 @@ extern inline pte_t pte_mkdirty(pte_t pte)
return pte; return pte;
} }
extern inline pte_t pte_mkold(pte_t pte) static inline pte_t pte_mkold(pte_t pte)
{ {
/* S/390 doesn't keep its dirty/referenced bit in the pte. /* S/390 doesn't keep its dirty/referenced bit in the pte.
* There is no point in clearing the real referenced bit. * There is no point in clearing the real referenced bit.
...@@ -515,7 +515,7 @@ extern inline pte_t pte_mkold(pte_t pte) ...@@ -515,7 +515,7 @@ extern inline pte_t pte_mkold(pte_t pte)
return pte; return pte;
} }
extern inline pte_t pte_mkyoung(pte_t pte) static inline pte_t pte_mkyoung(pte_t pte)
{ {
/* S/390 doesn't keep its dirty/referenced bit in the pte. /* S/390 doesn't keep its dirty/referenced bit in the pte.
* There is no point in setting the real referenced bit. * There is no point in setting the real referenced bit.
...@@ -695,7 +695,7 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot) ...@@ -695,7 +695,7 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
#ifndef __s390x__ #ifndef __s390x__
/* Find an entry in the second-level page table.. */ /* 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; return (pmd_t *) dir;
} }
...@@ -758,7 +758,7 @@ extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address) ...@@ -758,7 +758,7 @@ extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
#else #else
#define __SWP_OFFSET_MASK (~0UL >> 11) #define __SWP_OFFSET_MASK (~0UL >> 11)
#endif #endif
extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
{ {
pte_t pte; pte_t pte;
offset &= __SWP_OFFSET_MASK; offset &= __SWP_OFFSET_MASK;
......
...@@ -67,7 +67,7 @@ typedef enum ...@@ -67,7 +67,7 @@ typedef enum
/* /*
* Signal processor * Signal processor
*/ */
extern __inline__ sigp_ccode static inline sigp_ccode
signal_processor(__u16 cpu_addr, sigp_order_code order_code) signal_processor(__u16 cpu_addr, sigp_order_code order_code)
{ {
sigp_ccode ccode; sigp_ccode ccode;
...@@ -86,7 +86,7 @@ signal_processor(__u16 cpu_addr, sigp_order_code order_code) ...@@ -86,7 +86,7 @@ signal_processor(__u16 cpu_addr, sigp_order_code order_code)
/* /*
* Signal processor with parameter * Signal processor with parameter
*/ */
extern __inline__ sigp_ccode static inline sigp_ccode
signal_processor_p(__u32 parameter, __u16 cpu_addr, signal_processor_p(__u32 parameter, __u16 cpu_addr,
sigp_order_code order_code) sigp_order_code order_code)
{ {
...@@ -107,7 +107,7 @@ signal_processor_p(__u32 parameter, __u16 cpu_addr, ...@@ -107,7 +107,7 @@ signal_processor_p(__u32 parameter, __u16 cpu_addr,
/* /*
* Signal processor with parameter and return status * Signal processor with parameter and return status
*/ */
extern __inline__ sigp_ccode static inline sigp_ccode
signal_processor_ps(__u32 *statusptr, __u32 parameter, signal_processor_ps(__u32 *statusptr, __u32 parameter,
__u16 cpu_addr, sigp_order_code order_code) __u16 cpu_addr, sigp_order_code order_code)
{ {
......
...@@ -52,7 +52,7 @@ extern int smp_call_function_on(void (*func) (void *info), void *info, ...@@ -52,7 +52,7 @@ extern int smp_call_function_on(void (*func) (void *info), void *info,
extern int smp_get_cpu(cpumask_t cpu_map); extern int smp_get_cpu(cpumask_t cpu_map);
extern void smp_put_cpu(int cpu); extern void smp_put_cpu(int cpu);
extern __inline__ __u16 hard_smp_processor_id(void) static inline __u16 hard_smp_processor_id(void)
{ {
__u16 cpu_address; __u16 cpu_address;
......
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