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

Commit c514b8be authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

[PATCH] m68knommu: change use of extern inline to static inline in headers 



"extern inline" doesn't make much sense here.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f98e8569

include/asm-m68knommu/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v) 
#define smp_mb__before_atomic_inc()    barrier()

#define smp_mb__after_atomic_inc() barrier()



extern __inline__ int atomic_add_return(int i, atomic_t * v)

static inline int atomic_add_return(int i, atomic_t * v)

{

	unsigned long temp, flags;
@@ -115,7 +115,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) 


#define atomic_add_negative(a, v)	(atomic_add_return((a), (v)) < 0)



extern __inline__ int atomic_sub_return(int i, atomic_t * v)

static inline int atomic_sub_return(int i, atomic_t * v)

{

	unsigned long temp, flags;

include/asm-m68knommu/delay.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <asm/param.h>



extern __inline__ void __delay(unsigned long loops)

static inline void __delay(unsigned long loops)

{

#if defined(CONFIG_COLDFIRE)

	/* The coldfire runs this loop at significantly different speeds
@@ -48,7 +48,7 @@ extern __inline__ void __delay(unsigned long loops) 


extern unsigned long loops_per_jiffy;



extern __inline__ void _udelay(unsigned long usecs)

static inline void _udelay(unsigned long usecs)

{

#if defined(CONFIG_M68328) || defined(CONFIG_M68EZ328) || \

    defined(CONFIG_M68VZ328) || defined(CONFIG_M68360) || \

include/asm-m68knommu/io.h

+4 −4
Original line number Diff line number Diff line
@@ -147,19 +147,19 @@ static inline void io_insl(unsigned int addr, void *buf, int len) 
extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);

extern void __iounmap(void *addr, unsigned long size);



extern inline void *ioremap(unsigned long physaddr, unsigned long size)

static inline void *ioremap(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);

}

extern inline void *ioremap_nocache(unsigned long physaddr, unsigned long size)

static inline void *ioremap_nocache(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);

}

extern inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size)

static inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);

}

extern inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size)

static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);

}

include/asm-m68knommu/mcfwdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
 * that the debug module instructions (2 longs) must be long word aligned and

 * some pointer fiddling is performed to ensure this.

 */

extern inline void wdebug(int reg, unsigned long data) {

static inline void wdebug(int reg, unsigned long data) {

	unsigned short dbg_spc[6];

	unsigned short *dbg;

include/asm-m68knommu/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 
{

}



extern inline int

static inline int

init_new_context(struct task_struct *tsk, struct mm_struct *mm)

{

	// mm->context = virt_to_phys(mm->pgd);
@@ -25,7 +25,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, str 


#define deactivate_mm(tsk,mm)	do { } while (0)



extern inline void activate_mm(struct mm_struct *prev_mm,

static inline void activate_mm(struct mm_struct *prev_mm,

			       struct mm_struct *next_mm)

{

}