s390: "extern inline" -> "static inline"
Subsystems (6)
PATCH 1/1 s390: "extern inline" -> "static inline"
"extern inline" doesn't make much sense.
Signed-off-by Adrian Bunk <[email protected]>
---
Documentation/s390/Debugging390.txt | 2 arch/s390/kernel/debug.c | 12 ++-- arch/s390/mm/fault.c | 2 drivers/s390/char/keyboard.h | 4 - drivers/s390/cio/ioasm.h | 26 +++++----- drivers/s390/cio/qdio.h | 8 +-- drivers/s390/net/fsm.h | 6 +- drivers/s390/s390mach.h | 2 include/asm-s390/debug.h | 16 +++--- include/asm-s390/ebcdic.h | 2 include/asm-s390/io.h | 8 +-- include/asm-s390/lowcore.h | 2 include/asm-s390/mmu_context.h | 2 include/asm-s390/pgtable.h | 70 ++++++++++++++-------------- include/asm-s390/sigp.h | 6 +- include/asm-s390/smp.h | 2 include/asm-s390/uaccess.h | 2 17 files changed, 86 insertions(+), 86 deletions(-)
Documentation/s390/Debugging390.txt renamed from Documentation/s390/Debugging390.txt.old +1 -1
@@ -871,7 +871,7 @@ -extern inline void spin_lock(spinlock_t *lp) +static inline void spin_lock(spinlock_t *lp) { a0: 18 34 lr %r3,%r4 a2: a7 3a 03 bc ahi %r3,956
arch/s390/kernel/debug.c renamed from arch/s390/kernel/debug.c.old +6 -6
@@ -470,7 +470,7 @@* - goto next entry in p_info */ -extern inline int +static inline int debug_next_entry (file_private_info_t *p_info) {debug_info_t *id;
@@ -788,7 +788,7 @@* - set active entry to next in the ring buffer */ -extern inline void +static inline void proceed_active_entry (debug_info_t * id) { if ((id->active_entries[id->active_area] += id->entry_size)
@@ -805,7 +805,7 @@* - set active area to next in the ring buffer */ -extern inline void +static inline void proceed_active_area (debug_info_t * id) { id->active_area++;
@@ -816,7 +816,7 @@* get_active_entry: */ -extern inline debug_entry_t * +static inline debug_entry_t *get_active_entry (debug_info_t * id) { return (debug_entry_t *) (((char *) id->areas[id->active_area]
@@ -829,7 +829,7 @@* - 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,int exception) {
@@ -959,7 +959,7 @@* counts arguments in format string for sprintf view */ -extern inline int +static inline int debug_count_numargs (char *string) {int numargs=0 ;
arch/s390/mm/fault.c renamed from arch/s390/mm/fault.c.old +1 -1
@@ -160,7 +160,7 @@* 11 Page translation -> 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) {struct task_struct *tsk;
drivers/s390/char/keyboard.h renamed from drivers/s390/char/keyboard.h.old +2 -2
@@ -41,14 +41,14 @@/* * Helper Functions. */ -extern inline void +static inline void kbd_put_queue (struct tty_struct *tty,int ch) {tty_insert_flip_char (tty, ch,0 );tty_schedule_flip (tty); } -extern inline void +static inline void kbd_puts_queue (struct tty_struct *tty,char *cp) {while (*cp)
drivers/s390/cio/ioasm.h renamed from drivers/s390/cio/ioasm.h.old +13 -13
@@ -21,7 +21,7 @@* Some S390 specific IO instructions as inline */ -extern __inline__int stsch (int irq,volatile struct schib *addr) +static inline int stsch (int irq,volatile struct schib *addr) {int ccode;
@@ -36,7 +36,7 @@return ccode; } -extern __inline__int msch (int irq,volatile struct schib *addr) +static inline int msch (int irq,volatile struct schib *addr) {int ccode;
@@ -51,7 +51,7 @@return ccode; } -extern __inline__int msch_err (int irq,volatile struct schib *addr) +static inline int msch_err (int irq,volatile struct schib *addr) {int ccode;
@@ -79,7 +79,7 @@return ccode; } -extern __inline__int tsch (int irq,volatile struct irb *addr) +static inline int tsch (int irq,volatile struct irb *addr) {int ccode;
@@ -94,7 +94,7 @@return ccode; } -extern __inline__int tpi (volatile struct tpi_info *addr) +static inline int tpi (volatile struct tpi_info *addr) {int ccode;
@@ -108,7 +108,7 @@return ccode; } -extern __inline__int ssch (int irq,volatile struct orb *addr) +static inline int ssch (int irq,volatile struct orb *addr) {int ccode;
@@ -123,7 +123,7 @@return ccode; } -extern __inline__int rsch (int irq) +static inline int rsch (int irq) {int ccode;
@@ -138,7 +138,7 @@return ccode; } -extern __inline__int csch (int irq) +static inline int csch (int irq) {int ccode;
@@ -153,7 +153,7 @@return ccode; } -extern __inline__int hsch (int irq) +static inline int hsch (int irq) {int ccode;
@@ -168,7 +168,7 @@return ccode; } -extern __inline__int xsch (int irq) +static inline int xsch (int irq) {int ccode;
@@ -183,7 +183,7 @@return ccode; } -extern __inline__int chsc (void *chsc_area) +static inline int chsc (void *chsc_area) {int cc;
@@ -198,7 +198,7 @@return cc; } -extern __inline__int iac (void ) +static inline int iac (void ) {int ccode;
@@ -210,7 +210,7 @@return ccode; } -extern __inline__int rchp (int chpid) +static inline int rchp (int chpid) {int ccode;
drivers/s390/cio/qdio.h renamed from drivers/s390/cio/qdio.h.old +4 -4
@@ -265,7 +265,7 @@/* * Some instructions as assembly */ -extern __inline__int +static inline int do_siga_sync (unsigned int irq,unsigned int mask1,unsigned int mask2) {int cc;
@@ -300,7 +300,7 @@return cc; } -extern __inline__int +static inline int do_siga_input (unsigned int irq,unsigned int mask) {int cc;
@@ -334,7 +334,7 @@return cc; } -extern __inline__int +static inline int do_siga_output (unsigned long irq,unsigned long mask,__u32 *bb) {int cc;
@@ -401,7 +401,7 @@return cc; } -extern __inline__unsigned long +static inline unsigned long do_clear_global_summary (void ) {
drivers/s390/net/fsm.h renamed from drivers/s390/net/fsm.h.old +3 -3
@@ -140,7 +140,7 @@* 1 if current state or event is out of range * !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_function_t r;
@@ -188,7 +188,7 @@* @param fi Pointer to FSM * @param state The new state for this FSM. */ -extern __inline__void +static inline void fsm_newstate (fsm_instance *fi,int newstate) {atomic_set (&fi->state,newstate);
@@ -208,7 +208,7 @@* * @return The current state of the FSM. */ -extern __inline__int +static inline int fsm_getstate (fsm_instance *fi) {return atomic_read (&fi->state);
drivers/s390/s390mach.h renamed from drivers/s390/s390mach.h.old +1 -1
@@ -88,7 +88,7 @@#define CRW_ERC_PERRI 0x07/* perm. error, facility init */ #define CRW_ERC_PMOD 0x08/* installed parameters modified */ -extern __inline__int stcrw (struct crw *pcrw ) +static inline int stcrw (struct crw *pcrw ) {int ccode;
include/asm-s390/debug.h renamed from include/asm-s390/debug.h.old +8 -8
@@ -131,7 +131,7 @@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 ))
@@ -139,7 +139,7 @@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;
@@ -148,7 +148,7 @@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;
@@ -157,7 +157,7 @@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 ))
@@ -170,7 +170,7 @@ __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 ))
@@ -178,7 +178,7 @@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;
@@ -187,7 +187,7 @@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;
@@ -196,7 +196,7 @@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 ))
include/asm-s390/ebcdic.h renamed from include/asm-s390/ebcdic.h.old +1 -1
@@ -21,7 +21,7 @@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 )
include/asm-s390/io.h renamed from include/asm-s390/io.h.old +4 -4
@@ -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 @@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 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 @@* 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 ); }
include/asm-s390/lowcore.h renamed from include/asm-s390/lowcore.h.old +1 -1
@@ -342,7 +342,7 @@#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" ); }
include/asm-s390/mmu_context.h renamed from include/asm-s390/mmu_context.h.old +1 -1
@@ -44,7 +44,7 @@#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);
include/asm-s390/pgtable.h renamed from include/asm-s390/pgtable.h.old +35 -35
221 lines not on this page · raw message
include/asm-s390/sigp.h renamed from include/asm-s390/sigp.h.old +3 -3
@@ -67,7 +67,7 @@/* * 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 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 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) {
include/asm-s390/smp.h renamed from include/asm-s390/smp.h.old +1 -1
@@ -52,7 +52,7 @@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;
include/asm-s390/uaccess.h renamed from include/asm-s390/uaccess.h.old +1 -1
@@ -66,7 +66,7 @@#define access_ok (type,addr,size) __access_ok(addr,size)/* this function will go away soon - use access_ok() instead */ -extern inline int __deprecated verify_area (int type,const void __user *addr, +static inline int __deprecated verify_area (int type,const void __user *addr,unsigned long size) {return access_ok (type, addr, size) ?0 : -EFAULT ;