From: Adrian Bunk "extern inline" will have different semantics with gcc 4.3. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- arch/arm/nwfpe/ARM-gcc.h | 2 +- arch/arm/nwfpe/fpa11.inl | 8 ++++---- include/asm-arm/arch-ixp23xx/platform.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff -puN arch/arm/nwfpe/ARM-gcc.h~arm-extern-inline-static-inline arch/arm/nwfpe/ARM-gcc.h --- a/arch/arm/nwfpe/ARM-gcc.h~arm-extern-inline-static-inline +++ a/arch/arm/nwfpe/ARM-gcc.h @@ -68,7 +68,7 @@ a compiler does not support explicit inl 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. */ diff -puN arch/arm/nwfpe/fpa11.inl~arm-extern-inline-static-inline arch/arm/nwfpe/fpa11.inl --- a/arch/arm/nwfpe/fpa11.inl~arm-extern-inline-static-inline +++ a/arch/arm/nwfpe/fpa11.inl @@ -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 re } /* 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 */ diff -puN include/asm-arm/arch-ixp23xx/platform.h~arm-extern-inline-static-inline include/asm-arm/arch-ixp23xx/platform.h --- a/include/asm-arm/arch-ixp23xx/platform.h~arm-extern-inline-static-inline +++ a/include/asm-arm/arch-ixp23xx/platform.h @@ -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; } _