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

Commit 38598105 authored by Adrian Bunk's avatar Adrian Bunk Committed by Russell King
Browse files

[ARM] "extern inline" -> "static inline" 



"extern inline" will have different semantics with gcc 4.3.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5e802dfa

arch/arm/nwfpe/ARM-gcc.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ a compiler does not support explicit inlining, this macro should be defined 
to be `static'.

-------------------------------------------------------------------------------

*/

#define INLINE extern __inline__

#define INLINE static inline





/* For use as a GCC soft-float library we need some special function names. */

arch/arm/nwfpe/fpa11.inl

+4 −4
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 
#include "fpa11.h"



/* Read and write floating point status register */

extern __inline__ unsigned int readFPSR(void)

static inline unsigned int readFPSR(void)

{

	FPA11 *fpa11 = GET_FPA11();

	return (fpa11->fpsr);

}



extern __inline__ void writeFPSR(FPSR reg)

static inline void writeFPSR(FPSR reg)

{

	FPA11 *fpa11 = GET_FPA11();

	/* the sysid byte in the status register is readonly */
@@ -36,14 +36,14 @@ extern __inline__ void writeFPSR(FPSR reg) 
}



/* Read and write floating point control register */

extern __inline__ FPCR readFPCR(void)

static inline FPCR readFPCR(void)

{

	FPA11 *fpa11 = GET_FPA11();

	/* clear SB, AB and DA bits before returning FPCR */

	return (fpa11->fpcr & ~MASK_RFC);

}



extern __inline__ void writeFPCR(FPCR reg)

static inline void writeFPCR(FPCR reg)

{

	FPA11 *fpa11 = GET_FPA11();

	fpa11->fpcr &= ~MASK_WFC;		/* clear SB, AB and DA bits */

include/asm-arm/arch-ixp23xx/platform.h

+3 −3
Original line number Diff line number Diff line
@@ -14,17 +14,17 @@ 


#ifndef __ASSEMBLY__



extern inline unsigned long ixp2000_reg_read(volatile void *reg)

static inline unsigned long ixp2000_reg_read(volatile void *reg)

{

	return *((volatile unsigned long *)reg);

}



extern inline void ixp2000_reg_write(volatile void *reg, unsigned long val)

static inline void ixp2000_reg_write(volatile void *reg, unsigned long val)

{

	*((volatile unsigned long *)reg) = val;

}



extern inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val)

static inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val)

{

	*((volatile unsigned long *)reg) = val;

}