diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-08 17:14:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-08 17:14:02 -0400 |
| commit | fb69b6cd270444c8d248e70e6be7c58f9828debd (patch) | |
| tree | 487b0edd5d3fbf3bf324f58132c397cc2c81cc76 /arch/mips/include/asm/system.h | |
| parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) | |
| parent | b11c5d1dc29e81326d1215011d19377737082aeb (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/include/asm/system.h')
| -rw-r--r-- | arch/mips/include/asm/system.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h index 7a2895284ed..d56f73b8b8e 100644 --- a/arch/mips/include/asm/system.h +++ b/arch/mips/include/asm/system.h @@ -22,7 +22,7 @@ #include <linux/kernel.h> #endif -extern __inline__ void +static __inline__ void __sti(void) { __asm__ __volatile__( @@ -46,7 +46,7 @@ __sti(void) * R4000/R4400 need three nops, the R4600 two nops and the R10000 needs * no nops at all. */ -extern __inline__ void +static __inline__ void __cli(void) { __asm__ __volatile__( @@ -207,7 +207,7 @@ do { \ * For 32 and 64 bit operands we can take advantage of ll and sc. * FIXME: This doesn't work for R3000 machines. */ -extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val) +static __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val) { #ifdef CONFIG_CPU_HAS_LLSC unsigned long dummy; |