diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-12-06 23:40:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:45 -0500 |
commit | 219576e127c4f7770aa985f719e815936bc54367 (patch) | |
tree | 5e8caf17cae3a23105ce5d229c3e943d2edb9b77 | |
parent | bb8cc641653d785e3f3b8d3b0182a69edf825802 (diff) |
[PATCH] include/asm-h8300/: "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>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | include/asm-h8300/delay.h | 4 | ||||
-rw-r--r-- | include/asm-h8300/mmu_context.h | 4 | ||||
-rw-r--r-- | include/asm-h8300/pci.h | 4 | ||||
-rw-r--r-- | include/asm-h8300/tlbflush.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-h8300/delay.h b/include/asm-h8300/delay.h index cbccbbdd640f..743beba70f82 100644 --- a/include/asm-h8300/delay.h +++ b/include/asm-h8300/delay.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * Delay routines, using a pre-computed "loops_per_second" value. | 9 | * Delay routines, using a pre-computed "loops_per_second" value. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | extern __inline__ void __delay(unsigned long loops) | 12 | static inline void __delay(unsigned long loops) |
13 | { | 13 | { |
14 | __asm__ __volatile__ ("1:\n\t" | 14 | __asm__ __volatile__ ("1:\n\t" |
15 | "dec.l #1,%0\n\t" | 15 | "dec.l #1,%0\n\t" |
@@ -27,7 +27,7 @@ extern __inline__ void __delay(unsigned long loops) | |||
27 | 27 | ||
28 | extern unsigned long loops_per_jiffy; | 28 | extern unsigned long loops_per_jiffy; |
29 | 29 | ||
30 | extern __inline__ void udelay(unsigned long usecs) | 30 | static inline void udelay(unsigned long usecs) |
31 | { | 31 | { |
32 | usecs *= 4295; /* 2**32 / 1000000 */ | 32 | usecs *= 4295; /* 2**32 / 1000000 */ |
33 | usecs /= (loops_per_jiffy*HZ); | 33 | usecs /= (loops_per_jiffy*HZ); |
diff --git a/include/asm-h8300/mmu_context.h b/include/asm-h8300/mmu_context.h index 855721a5dcc9..5c165f7bee0e 100644 --- a/include/asm-h8300/mmu_context.h +++ b/include/asm-h8300/mmu_context.h | |||
@@ -9,7 +9,7 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) | |||
9 | { | 9 | { |
10 | } | 10 | } |
11 | 11 | ||
12 | extern inline int | 12 | static inline int |
13 | init_new_context(struct task_struct *tsk, struct mm_struct *mm) | 13 | init_new_context(struct task_struct *tsk, struct mm_struct *mm) |
14 | { | 14 | { |
15 | // mm->context = virt_to_phys(mm->pgd); | 15 | // mm->context = virt_to_phys(mm->pgd); |
@@ -23,7 +23,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, str | |||
23 | { | 23 | { |
24 | } | 24 | } |
25 | 25 | ||
26 | extern inline void activate_mm(struct mm_struct *prev_mm, | 26 | static inline void activate_mm(struct mm_struct *prev_mm, |
27 | struct mm_struct *next_mm) | 27 | struct mm_struct *next_mm) |
28 | { | 28 | { |
29 | } | 29 | } |
diff --git a/include/asm-h8300/pci.h b/include/asm-h8300/pci.h index 5edad5b70fd5..0c771b05fdd5 100644 --- a/include/asm-h8300/pci.h +++ b/include/asm-h8300/pci.h | |||
@@ -10,12 +10,12 @@ | |||
10 | #define pcibios_assign_all_busses() 0 | 10 | #define pcibios_assign_all_busses() 0 |
11 | #define pcibios_scan_all_fns(a, b) 0 | 11 | #define pcibios_scan_all_fns(a, b) 0 |
12 | 12 | ||
13 | extern inline void pcibios_set_master(struct pci_dev *dev) | 13 | static inline void pcibios_set_master(struct pci_dev *dev) |
14 | { | 14 | { |
15 | /* No special bus mastering setup handling */ | 15 | /* No special bus mastering setup handling */ |
16 | } | 16 | } |
17 | 17 | ||
18 | extern inline void pcibios_penalize_isa_irq(int irq, int active) | 18 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
19 | { | 19 | { |
20 | /* We don't do dynamic PCI IRQ allocation */ | 20 | /* We don't do dynamic PCI IRQ allocation */ |
21 | } | 21 | } |
diff --git a/include/asm-h8300/tlbflush.h b/include/asm-h8300/tlbflush.h index bbdffbeeedef..9a2c5c9fd700 100644 --- a/include/asm-h8300/tlbflush.h +++ b/include/asm-h8300/tlbflush.h | |||
@@ -47,12 +47,12 @@ static inline void flush_tlb_range(struct mm_struct *mm, | |||
47 | BUG(); | 47 | BUG(); |
48 | } | 48 | } |
49 | 49 | ||
50 | extern inline void flush_tlb_kernel_page(unsigned long addr) | 50 | static inline void flush_tlb_kernel_page(unsigned long addr) |
51 | { | 51 | { |
52 | BUG(); | 52 | BUG(); |
53 | } | 53 | } |
54 | 54 | ||
55 | extern inline void flush_tlb_pgtables(struct mm_struct *mm, | 55 | static inline void flush_tlb_pgtables(struct mm_struct *mm, |
56 | unsigned long start, unsigned long end) | 56 | unsigned long start, unsigned long end) |
57 | { | 57 | { |
58 | BUG(); | 58 | BUG(); |