1 From b11c5d1dc29e81326d1215011d19377737082aeb Mon Sep 17 00:00:00 2001
2 From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
3 Date: Wed, 1 Jul 2015 16:36:43 +0200
4 Subject: [PATCH] MIPS: change 'extern inline' to 'static inline'
6 The kernel changed it a long time ago. Also this is now broken
9 Reported-by: Andy Kennedy <andy.kennedy@adtran.com>
10 Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
12 arch/mips/include/asm/io.h | 12 ++++++------
13 arch/mips/include/asm/system.h | 6 +++---
14 2 files changed, 9 insertions(+), 9 deletions(-)
16 --- a/arch/mips/include/asm/io.h
17 +++ b/arch/mips/include/asm/io.h
18 @@ -118,7 +118,7 @@ static inline void set_io_port_base(unsi
19 * Change virtual addresses to physical addresses and vv.
20 * These are trivial on the 1:1 Linux/MIPS mapping
22 -extern inline phys_addr_t virt_to_phys(volatile void * address)
23 +static inline phys_addr_t virt_to_phys(volatile void * address)
26 return CPHYSADDR(address);
27 @@ -127,7 +127,7 @@ extern inline phys_addr_t virt_to_phys(v
31 -extern inline void * phys_to_virt(unsigned long address)
32 +static inline void * phys_to_virt(unsigned long address)
35 return (void *)KSEG0ADDR(address);
36 @@ -139,7 +139,7 @@ extern inline void * phys_to_virt(unsign
38 * IO bus memory addresses are also 1:1 with the physical address
40 -extern inline unsigned long virt_to_bus(volatile void * address)
41 +static inline unsigned long virt_to_bus(volatile void * address)
44 return CPHYSADDR(address);
45 @@ -148,7 +148,7 @@ extern inline unsigned long virt_to_bus(
49 -extern inline void * bus_to_virt(unsigned long address)
50 +static inline void * bus_to_virt(unsigned long address)
53 return (void *)KSEG0ADDR(address);
54 @@ -166,12 +166,12 @@ extern unsigned long isa_slot_offset;
55 extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
58 -extern inline void *ioremap(unsigned long offset, unsigned long size)
59 +static inline void *ioremap(unsigned long offset, unsigned long size)
61 return __ioremap(offset, size, _CACHE_UNCACHED);
64 -extern inline void *ioremap_nocache(unsigned long offset, unsigned long size)
65 +static inline void *ioremap_nocache(unsigned long offset, unsigned long size)
67 return __ioremap(offset, size, _CACHE_UNCACHED);
69 --- a/arch/mips/include/asm/system.h
70 +++ b/arch/mips/include/asm/system.h
72 #include <linux/kernel.h>
75 -extern __inline__ void
76 +static __inline__ void
80 @@ -47,7 +47,7 @@ __sti(void)
81 * R4000/R4400 need three nops, the R4600 two nops and the R10000 needs
84 -extern __inline__ void
85 +static __inline__ void
89 @@ -208,7 +208,7 @@ do { \
90 * For 32 and 64 bit operands we can take advantage of ll and sc.
91 * FIXME: This doesn't work for R3000 machines.
93 -extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
94 +static __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
96 #ifdef CONFIG_CPU_HAS_LLSC