mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
[PATCH] s390: "extern inline" -> "static inline"
"extern inline" -> "static inline" Signed-off-by: Adrian Bunk <[email protected]> Cc: Martin Schwidefsky <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
0fbeb5a45d
commit
4448aaf0fa
15 changed files with 71 additions and 71 deletions
|
|
@ -129,7 +129,7 @@ void debug_set_level(debug_info_t* id, int new_level);
|
|||
|
||||
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)
|
||||
{
|
||||
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)
|
|||
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)
|
||||
{
|
||||
unsigned int t=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));
|
||||
}
|
||||
|
||||
extern inline debug_entry_t *
|
||||
static inline debug_entry_t *
|
||||
debug_long_event (debug_info_t* id, int level, unsigned long tag)
|
||||
{
|
||||
unsigned long t=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));
|
||||
}
|
||||
|
||||
extern inline debug_entry_t*
|
||||
static inline debug_entry_t*
|
||||
debug_text_event(debug_info_t* id, int level, const char* txt)
|
||||
{
|
||||
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,...)
|
|||
__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)
|
||||
{
|
||||
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)
|
|||
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)
|
||||
{
|
||||
unsigned int t=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));
|
||||
}
|
||||
|
||||
extern inline debug_entry_t *
|
||||
static inline debug_entry_t *
|
||||
debug_long_exception (debug_info_t* id, int level, unsigned long tag)
|
||||
{
|
||||
unsigned long t=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));
|
||||
}
|
||||
|
||||
extern inline debug_entry_t*
|
||||
static inline debug_entry_t*
|
||||
debug_text_exception(debug_info_t* id, int level, const char* txt)
|
||||
{
|
||||
if ((!id) || (level > id->level) || (id->pages_per_area == 0))
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ extern __u8 _ebcasc[]; /* EBCDIC -> ASCII conversion table */
|
|||
extern __u8 _ebc_tolower[]; /* EBCDIC -> lowercase */
|
||||
extern __u8 _ebc_toupper[]; /* EBCDIC -> uppercase */
|
||||
|
||||
extern __inline__ void
|
||||
static inline void
|
||||
codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)
|
||||
{
|
||||
if (nr-- <= 0)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* Change virtual addresses to physical addresses and vv.
|
||||
* 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;
|
||||
__asm__ (
|
||||
|
|
@ -42,7 +42,7 @@ extern inline unsigned long virt_to_phys(volatile void * 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);
|
||||
}
|
||||
|
|
@ -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 inline void * ioremap (unsigned long offset, unsigned long size)
|
||||
static inline void * ioremap (unsigned long offset, unsigned long size)
|
||||
{
|
||||
return __ioremap(offset, size, 0);
|
||||
}
|
||||
|
|
@ -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
|
||||
* 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ struct _lowcore
|
|||
#define S390_lowcore (*((struct _lowcore *) 0))
|
||||
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" );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
extern inline void activate_mm(struct mm_struct *prev,
|
||||
static inline void activate_mm(struct mm_struct *prev,
|
||||
struct mm_struct *next)
|
||||
{
|
||||
switch_mm(prev, next, current);
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ extern char empty_zero_page[PAGE_SIZE];
|
|||
* within a page table are directly modified. Thus, the following
|
||||
* 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;
|
||||
}
|
||||
|
|
@ -330,63 +330,63 @@ extern inline void set_pte(pte_t *pteptr, pte_t pteval)
|
|||
*/
|
||||
#ifndef __s390x__
|
||||
|
||||
extern inline int pgd_present(pgd_t pgd) { return 1; }
|
||||
extern inline int pgd_none(pgd_t pgd) { return 0; }
|
||||
extern inline int pgd_bad(pgd_t pgd) { return 0; }
|
||||
static inline int pgd_present(pgd_t pgd) { return 1; }
|
||||
static inline int pgd_none(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; }
|
||||
extern 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_present(pmd_t pmd) { return pmd_val(pmd) & _SEG_PRESENT; }
|
||||
static inline int pmd_none(pmd_t pmd) { return pmd_val(pmd) & _PAGE_TABLE_INV; }
|
||||
static inline int pmd_bad(pmd_t pmd)
|
||||
{
|
||||
return (pmd_val(pmd) & (~PAGE_MASK & ~_PAGE_TABLE_INV)) != _PAGE_TABLE;
|
||||
}
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
extern inline int pgd_none(pgd_t pgd)
|
||||
static inline int pgd_none(pgd_t pgd)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
extern inline int pmd_present(pmd_t pmd)
|
||||
static inline int pmd_present(pmd_t pmd)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
extern inline int pte_present(pte_t pte)
|
||||
static inline int pte_present(pte_t pte)
|
||||
{
|
||||
return !(pte_val(pte) & _PAGE_INVALID) ||
|
||||
(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;
|
||||
}
|
||||
|
|
@ -397,12 +397,12 @@ extern inline int pte_file(pte_t pte)
|
|||
* query functions pte_write/pte_dirty/pte_young only work if
|
||||
* 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;
|
||||
}
|
||||
|
||||
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
|
||||
* is in the storage key. See page_test_and_clear_dirty for
|
||||
|
|
@ -411,7 +411,7 @@ extern inline int pte_dirty(pte_t pte)
|
|||
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
|
||||
* is in the storage key. See page_test_and_clear_young for
|
||||
|
|
@ -420,7 +420,7 @@ extern inline int pte_young(pte_t pte)
|
|||
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
|
||||
* protection bit in the storage key.
|
||||
|
|
@ -434,9 +434,9 @@ extern inline int pte_read(pte_t pte)
|
|||
|
||||
#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[1]) = _PAGE_TABLE_INV;
|
||||
|
|
@ -446,12 +446,12 @@ extern inline void pmd_clear(pmd_t * pmdp)
|
|||
|
||||
#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;
|
||||
}
|
||||
|
||||
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_val1(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY;
|
||||
|
|
@ -459,7 +459,7 @@ extern inline void pmd_clear(pmd_t * pmdp)
|
|||
|
||||
#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;
|
||||
}
|
||||
|
|
@ -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
|
||||
* 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) |= pgprot_val(newprot);
|
||||
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! */
|
||||
if (!(pte_val(pte) & _PAGE_INVALID))
|
||||
|
|
@ -483,13 +483,13 @@ extern inline pte_t pte_wrprotect(pte_t 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;
|
||||
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.
|
||||
We must *not* clear the *physical* page dirty bit
|
||||
|
|
@ -498,7 +498,7 @@ extern inline pte_t pte_mkclean(pte_t 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
|
||||
* sske instruction is slow. It is faster to let the
|
||||
|
|
@ -507,7 +507,7 @@ extern inline pte_t pte_mkdirty(pte_t 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.
|
||||
* There is no point in clearing the real referenced bit.
|
||||
|
|
@ -515,7 +515,7 @@ extern inline pte_t pte_mkold(pte_t 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.
|
||||
* 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)
|
|||
#ifndef __s390x__
|
||||
|
||||
/* 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;
|
||||
}
|
||||
|
|
@ -758,7 +758,7 @@ extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
|
|||
#else
|
||||
#define __SWP_OFFSET_MASK (~0UL >> 11)
|
||||
#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;
|
||||
offset &= __SWP_OFFSET_MASK;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ typedef enum
|
|||
/*
|
||||
* Signal processor
|
||||
*/
|
||||
extern __inline__ sigp_ccode
|
||||
static inline sigp_ccode
|
||||
signal_processor(__u16 cpu_addr, sigp_order_code order_code)
|
||||
{
|
||||
sigp_ccode ccode;
|
||||
|
|
@ -86,7 +86,7 @@ signal_processor(__u16 cpu_addr, sigp_order_code order_code)
|
|||
/*
|
||||
* Signal processor with parameter
|
||||
*/
|
||||
extern __inline__ sigp_ccode
|
||||
static inline sigp_ccode
|
||||
signal_processor_p(__u32 parameter, __u16 cpu_addr,
|
||||
sigp_order_code order_code)
|
||||
{
|
||||
|
|
@ -107,7 +107,7 @@ signal_processor_p(__u32 parameter, __u16 cpu_addr,
|
|||
/*
|
||||
* Signal processor with parameter and return status
|
||||
*/
|
||||
extern __inline__ sigp_ccode
|
||||
static inline sigp_ccode
|
||||
signal_processor_ps(__u32 *statusptr, __u32 parameter,
|
||||
__u16 cpu_addr, sigp_order_code order_code)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 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;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue