Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f13cec8447f18cca3a0feb4b83b7ba6fae9e59ae

Authored by Adrian Bunk
Committed by Kyle McMartin
1 parent 0ed5462927
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

[PARISC] parisc: "extern inline" -> "static inline" 

"extern inline" will have different semantics with gcc 4.3, and "static
inline" is correct here.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Matthew Wilcox <willy@debian.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

Showing 7 changed files with 28 additions and 28 deletions Side-by-side Diff

arch/parisc/lib/memcpy.c
Diff comments   View file @ f13cec8
... ... @@ -139,12 +139,12 @@
139 139 #define stw(_s,_t,_o,_a,_e) def_store_insn(stw,"r",_s,_t,_o,_a,_e)
140 140  
141 141 #ifdef CONFIG_PREFETCH
142   -extern inline void prefetch_src(const void *addr)
  142 +static inline void prefetch_src(const void *addr)
143 143 {
144 144 __asm__("ldw 0(" s_space ",%0), %%r0" : : "r" (addr));
145 145 }
146 146  
147   -extern inline void prefetch_dst(const void *addr)
  147 +static inline void prefetch_dst(const void *addr)
148 148 {
149 149 __asm__("ldd 0(" d_space ",%0), %%r0" : : "r" (addr));
150 150 }
include/asm-parisc/io.h
Diff comments   View file @ f13cec8
... ... @@ -138,7 +138,7 @@
138 138 /* Most machines react poorly to I/O-space being cacheable... Instead let's
139 139 * define ioremap() in terms of ioremap_nocache().
140 140 */
141   -extern inline void __iomem * ioremap(unsigned long offset, unsigned long size)
  141 +static inline void __iomem * ioremap(unsigned long offset, unsigned long size)
142 142 {
143 143 return __ioremap(offset, size, _PAGE_NO_CACHE);
144 144 }
include/asm-parisc/pci.h
Diff comments   View file @ f13cec8
... ... @@ -207,7 +207,7 @@
207 207 extern void pcibios_register_hba(struct pci_hba_data *);
208 208 extern void pcibios_set_master(struct pci_dev *);
209 209 #else
210   -extern inline void pcibios_register_hba(struct pci_hba_data *x)
  210 +static inline void pcibios_register_hba(struct pci_hba_data *x)
211 211 {
212 212 }
213 213 #endif
include/asm-parisc/pgtable.h
Diff comments   View file @ f13cec8
... ... @@ -325,27 +325,27 @@
325 325 * setup: the pgd is never bad, and a pmd always exists (as it's folded
326 326 * into the pgd entry)
327 327 */
328   -extern inline int pgd_none(pgd_t pgd) { return 0; }
329   -extern inline int pgd_bad(pgd_t pgd) { return 0; }
330   -extern inline int pgd_present(pgd_t pgd) { return 1; }
331   -extern inline void pgd_clear(pgd_t * pgdp) { }
  328 +static inline int pgd_none(pgd_t pgd) { return 0; }
  329 +static inline int pgd_bad(pgd_t pgd) { return 0; }
  330 +static inline int pgd_present(pgd_t pgd) { return 1; }
  331 +static inline void pgd_clear(pgd_t * pgdp) { }
332 332 #endif
333 333  
334 334 /*
335 335 * The following only work if pte_present() is true.
336 336 * Undefined behaviour if not..
337 337 */
338   -extern inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
339   -extern inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; }
340   -extern inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; }
341   -extern inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; }
  338 +static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
  339 +static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; }
  340 +static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; }
  341 +static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; }
342 342  
343   -extern inline pte_t pte_mkclean(pte_t pte) { pte_val(pte) &= ~_PAGE_DIRTY; return pte; }
344   -extern inline pte_t pte_mkold(pte_t pte) { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
345   -extern inline pte_t pte_wrprotect(pte_t pte) { pte_val(pte) &= ~_PAGE_WRITE; return pte; }
346   -extern inline pte_t pte_mkdirty(pte_t pte) { pte_val(pte) |= _PAGE_DIRTY; return pte; }
347   -extern inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= _PAGE_ACCESSED; return pte; }
348   -extern inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) |= _PAGE_WRITE; return pte; }
  343 +static inline pte_t pte_mkclean(pte_t pte) { pte_val(pte) &= ~_PAGE_DIRTY; return pte; }
  344 +static inline pte_t pte_mkold(pte_t pte) { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
  345 +static inline pte_t pte_wrprotect(pte_t pte) { pte_val(pte) &= ~_PAGE_WRITE; return pte; }
  346 +static inline pte_t pte_mkdirty(pte_t pte) { pte_val(pte) |= _PAGE_DIRTY; return pte; }
  347 +static inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= _PAGE_ACCESSED; return pte; }
  348 +static inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) |= _PAGE_WRITE; return pte; }
349 349  
350 350 /*
351 351 * Conversion functions: convert a page and protection to a page entry,
... ... @@ -369,7 +369,7 @@
369 369 return pte;
370 370 }
371 371  
372   -extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
  372 +static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
373 373 { pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; }
374 374  
375 375 /* Permanent address of a page. On parisc we don't have highmem. */
include/asm-parisc/prefetch.h
Diff comments   View file @ f13cec8
... ... @@ -19,7 +19,7 @@
19 19 #ifdef CONFIG_PREFETCH
20 20  
21 21 #define ARCH_HAS_PREFETCH
22   -extern inline void prefetch(const void *addr)
  22 +static inline void prefetch(const void *addr)
23 23 {
24 24 __asm__("ldw 0(%0), %%r0" : : "r" (addr));
25 25 }
... ... @@ -27,7 +27,7 @@
27 27 /* LDD is a PA2.0 addition. */
28 28 #ifdef CONFIG_PA20
29 29 #define ARCH_HAS_PREFETCHW
30   -extern inline void prefetchw(const void *addr)
  30 +static inline void prefetchw(const void *addr)
31 31 {
32 32 __asm__("ldd 0(%0), %%r0" : : "r" (addr));
33 33 }
include/asm-parisc/semaphore.h
Diff comments   View file @ f13cec8
... ... @@ -54,7 +54,7 @@
54 54  
55 55 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)
56 56  
57   -extern inline void sema_init (struct semaphore *sem, int val)
  57 +static inline void sema_init (struct semaphore *sem, int val)
58 58 {
59 59 *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val);
60 60 }
... ... @@ -82,7 +82,7 @@
82 82 * interrupts while we're messing with the semaphore. Sorry.
83 83 */
84 84  
85   -extern __inline__ void down(struct semaphore * sem)
  85 +static inline void down(struct semaphore * sem)
86 86 {
87 87 might_sleep();
88 88 spin_lock_irq(&sem->sentry);
... ... @@ -94,7 +94,7 @@
94 94 spin_unlock_irq(&sem->sentry);
95 95 }
96 96  
97   -extern __inline__ int down_interruptible(struct semaphore * sem)
  97 +static inline int down_interruptible(struct semaphore * sem)
98 98 {
99 99 int ret = 0;
100 100 might_sleep();
... ... @@ -112,7 +112,7 @@
112 112 * down_trylock returns 0 on success, 1 if we failed to get the lock.
113 113 * May not sleep, but must preserve irq state
114 114 */
115   -extern __inline__ int down_trylock(struct semaphore * sem)
  115 +static inline int down_trylock(struct semaphore * sem)
116 116 {
117 117 unsigned long flags;
118 118 int count;
... ... @@ -129,7 +129,7 @@
129 129 * Note! This is subtle. We jump to wake people up only if
130 130 * the semaphore was negative (== somebody was waiting on it).
131 131 */
132   -extern __inline__ void up(struct semaphore * sem)
  132 +static inline void up(struct semaphore * sem)
133 133 {
134 134 unsigned long flags;
135 135  
include/asm-parisc/tlbflush.h
Diff comments   View file @ f13cec8
... ... @@ -57,7 +57,7 @@
57 57 #endif
58 58 }
59 59  
60   -extern __inline__ void flush_tlb_pgtables(struct mm_struct *mm, unsigned long start, unsigned long end)
  60 +static inline void flush_tlb_pgtables(struct mm_struct *mm, unsigned long start, unsigned long end)
61 61 {
62 62 }
63 63