mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
[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>
This commit is contained in:
parent
5e802dfab7
commit
3859810521
@ -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. */
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user