Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Adrian Bunk and committed by
Russell King
38598105 5e802dfa

+8 -8
+1 -1
arch/arm/nwfpe/ARM-gcc.h
··· 68 68 to be `static'. 69 69 ------------------------------------------------------------------------------- 70 70 */ 71 - #define INLINE extern __inline__ 71 + #define INLINE static inline 72 72 73 73 74 74 /* For use as a GCC soft-float library we need some special function names. */
+4 -4
arch/arm/nwfpe/fpa11.inl
··· 22 22 #include "fpa11.h" 23 23 24 24 /* Read and write floating point status register */ 25 - extern __inline__ unsigned int readFPSR(void) 25 + static inline unsigned int readFPSR(void) 26 26 { 27 27 FPA11 *fpa11 = GET_FPA11(); 28 28 return (fpa11->fpsr); 29 29 } 30 30 31 - extern __inline__ void writeFPSR(FPSR reg) 31 + static inline void writeFPSR(FPSR reg) 32 32 { 33 33 FPA11 *fpa11 = GET_FPA11(); 34 34 /* the sysid byte in the status register is readonly */ ··· 36 36 } 37 37 38 38 /* Read and write floating point control register */ 39 - extern __inline__ FPCR readFPCR(void) 39 + static inline FPCR readFPCR(void) 40 40 { 41 41 FPA11 *fpa11 = GET_FPA11(); 42 42 /* clear SB, AB and DA bits before returning FPCR */ 43 43 return (fpa11->fpcr & ~MASK_RFC); 44 44 } 45 45 46 - extern __inline__ void writeFPCR(FPCR reg) 46 + static inline void writeFPCR(FPCR reg) 47 47 { 48 48 FPA11 *fpa11 = GET_FPA11(); 49 49 fpa11->fpcr &= ~MASK_WFC; /* clear SB, AB and DA bits */
+3 -3
include/asm-arm/arch-ixp23xx/platform.h
··· 14 14 15 15 #ifndef __ASSEMBLY__ 16 16 17 - extern inline unsigned long ixp2000_reg_read(volatile void *reg) 17 + static inline unsigned long ixp2000_reg_read(volatile void *reg) 18 18 { 19 19 return *((volatile unsigned long *)reg); 20 20 } 21 21 22 - extern inline void ixp2000_reg_write(volatile void *reg, unsigned long val) 22 + static inline void ixp2000_reg_write(volatile void *reg, unsigned long val) 23 23 { 24 24 *((volatile unsigned long *)reg) = val; 25 25 } 26 26 27 - extern inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val) 27 + static inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val) 28 28 { 29 29 *((volatile unsigned long *)reg) = val; 30 30 }