1
0
Fork 0

[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>
hifive-unleashed-5.1
Adrian Bunk 2007-08-27 23:28:17 +02:00 committed by Russell King
parent 5e802dfab7
commit 3859810521
3 changed files with 8 additions and 8 deletions

View File

@ -68,7 +68,7 @@ a compiler does not support explicit inlining, this macro should be defined
to be `static'. 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. */ /* For use as a GCC soft-float library we need some special function names. */

View File

@ -22,13 +22,13 @@
#include "fpa11.h" #include "fpa11.h"
/* Read and write floating point status register */ /* Read and write floating point status register */
extern __inline__ unsigned int readFPSR(void) static inline unsigned int readFPSR(void)
{ {
FPA11 *fpa11 = GET_FPA11(); FPA11 *fpa11 = GET_FPA11();
return (fpa11->fpsr); return (fpa11->fpsr);
} }
extern __inline__ void writeFPSR(FPSR reg) static inline void writeFPSR(FPSR reg)
{ {
FPA11 *fpa11 = GET_FPA11(); FPA11 *fpa11 = GET_FPA11();
/* the sysid byte in the status register is readonly */ /* 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 */ /* Read and write floating point control register */
extern __inline__ FPCR readFPCR(void) static inline FPCR readFPCR(void)
{ {
FPA11 *fpa11 = GET_FPA11(); FPA11 *fpa11 = GET_FPA11();
/* clear SB, AB and DA bits before returning FPCR */ /* clear SB, AB and DA bits before returning FPCR */
return (fpa11->fpcr & ~MASK_RFC); return (fpa11->fpcr & ~MASK_RFC);
} }
extern __inline__ void writeFPCR(FPCR reg) static inline void writeFPCR(FPCR reg)
{ {
FPA11 *fpa11 = GET_FPA11(); FPA11 *fpa11 = GET_FPA11();
fpa11->fpcr &= ~MASK_WFC; /* clear SB, AB and DA bits */ fpa11->fpcr &= ~MASK_WFC; /* clear SB, AB and DA bits */

View File

@ -14,17 +14,17 @@
#ifndef __ASSEMBLY__ #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); 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; *((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; *((volatile unsigned long *)reg) = val;
} }