Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

Documentation/s390/Debugging390.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

      a2:       a7 3a 03 bc     ahi     %r3,956

arch/s390/kernel/debug.c

+6 −6
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ debug_format_entry(file_private_info_t *p_info) 
 * - 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;
@@ -800,7 +800,7 @@ debug_set_level(debug_info_t* id, int new_level) 
 * - 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)
@@ -817,7 +817,7 @@ proceed_active_entry(debug_info_t * id) 
 * - 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++;
@@ -828,7 +828,7 @@ proceed_active_area(debug_info_t * id) 
 * 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]
@@ -841,7 +841,7 @@ get_active_entry(debug_info_t * id) 
 * - 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)

{
@@ -971,7 +971,7 @@ debug_entry_t 
 * 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

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void do_sigsegv(struct pt_regs *regs, unsigned long error_code, 
 *   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

+2 −2
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ int kbd_ioctl(struct kbd_data *, struct file *, unsigned int, unsigned long); 
/*

 * 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/qdio.h

+4 −4
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ QDIO_PRINT_##importance(header "%02x %02x %02x %02x %02x %02x %02x %02x " \ 
/*

 * 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 @@ do_siga_sync(unsigned int irq, unsigned int mask1, unsigned int mask2) 
	return cc;

}



extern __inline__ int

static inline int

do_siga_input(unsigned int irq, unsigned int mask)

{

	int cc;
@@ -334,7 +334,7 @@ do_siga_input(unsigned int irq, unsigned int mask) 
	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 @@ do_siga_output(unsigned long irq, unsigned long mask, __u32 *bb) 
	return cc;

}



extern __inline__ unsigned long

static inline unsigned long

do_clear_global_summary(void)

{