Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4cfbdfff70989a0d99b6f357fbbe379c22a05f7c

Authored by Adrian Bunk
Committed by Paul Mackerras
1 parent 28f9ec349a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[POWERPC] include/asm-powerpc/: "extern inline" -> "static inline" 

"extern inline" generates a warning with -Wmissing-prototypes and I'm
currently working on getting the kernel cleaned up for adding this to
the CFLAGS since it will help us to avoid a nasty class of runtime
errors.

If there are places that really need a forced inline, __always_inline
would be the correct solution.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 3 changed files with 6 additions and 6 deletions Side-by-side Diff

include/asm-powerpc/io.h
Diff comments   View file @ 4cfbdff
... ... @@ -302,7 +302,7 @@
302 302 #ifdef CONFIG_PPC32
303 303  
304 304 #define __do_in_asm(name, op) \
305   -extern __inline__ unsigned int name(unsigned int port) \
  305 +static inline unsigned int name(unsigned int port) \
306 306 { \
307 307 unsigned int x; \
308 308 __asm__ __volatile__( \
... ... @@ -329,7 +329,7 @@
329 329 }
330 330  
331 331 #define __do_out_asm(name, op) \
332   -extern __inline__ void name(unsigned int val, unsigned int port) \
  332 +static inline void name(unsigned int val, unsigned int port) \
333 333 { \
334 334 __asm__ __volatile__( \
335 335 "sync\n" \
include/asm-powerpc/tsi108.h
Diff comments   View file @ 4cfbdff
... ... @@ -98,12 +98,12 @@
98 98 extern u32 get_vir_csrbase(void);
99 99 extern u32 tsi108_csr_vir_base;
100 100  
101   -extern inline u32 tsi108_read_reg(u32 reg_offset)
  101 +static inline u32 tsi108_read_reg(u32 reg_offset)
102 102 {
103 103 return in_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset));
104 104 }
105 105  
106   -extern inline void tsi108_write_reg(u32 reg_offset, u32 val)
  106 +static inline void tsi108_write_reg(u32 reg_offset, u32 val)
107 107 {
108 108 out_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset), val);
109 109 }
include/asm-powerpc/uaccess.h
Diff comments   View file @ 4cfbdff
... ... @@ -304,7 +304,7 @@
304 304  
305 305 #ifndef __powerpc64__
306 306  
307   -extern inline unsigned long copy_from_user(void *to,
  307 +static inline unsigned long copy_from_user(void *to,
308 308 const void __user *from, unsigned long n)
309 309 {
310 310 unsigned long over;
... ... @@ -319,7 +319,7 @@
319 319 return n;
320 320 }
321 321  
322   -extern inline unsigned long copy_to_user(void __user *to,
  322 +static inline unsigned long copy_to_user(void __user *to,
323 323 const void *from, unsigned long n)
324 324 {
325 325 unsigned long over;