diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-11-07 03:59:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:32 -0500 |
commit | 23f88fe4bffe01a0d29326789cb5813cd6f8158e (patch) | |
tree | 163c8a86cbc059e3f8a65eeb0c1ee366548e595c | |
parent | 26d89d1eef38473d0da64b7137952c56d0b6d13f (diff) |
[PATCH] include/asm-v850/ "extern inline" -> "static inline"
"extern inline" doesn't make much sense.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | include/asm-v850/atomic.h | 2 | ||||
-rw-r--r-- | include/asm-v850/bitops.h | 6 | ||||
-rw-r--r-- | include/asm-v850/delay.h | 4 | ||||
-rw-r--r-- | include/asm-v850/hw_irq.h | 2 | ||||
-rw-r--r-- | include/asm-v850/processor.h | 4 | ||||
-rw-r--r-- | include/asm-v850/semaphore.h | 10 | ||||
-rw-r--r-- | include/asm-v850/system.h | 2 | ||||
-rw-r--r-- | include/asm-v850/tlbflush.h | 4 | ||||
-rw-r--r-- | include/asm-v850/uaccess.h | 2 | ||||
-rw-r--r-- | include/asm-v850/unaligned.h | 6 |
10 files changed, 21 insertions, 21 deletions
diff --git a/include/asm-v850/atomic.h b/include/asm-v850/atomic.h index 8284aa7363f2..395268a8c0de 100644 --- a/include/asm-v850/atomic.h +++ b/include/asm-v850/atomic.h | |||
@@ -31,7 +31,7 @@ typedef struct { int counter; } atomic_t; | |||
31 | #define atomic_read(v) ((v)->counter) | 31 | #define atomic_read(v) ((v)->counter) |
32 | #define atomic_set(v,i) (((v)->counter) = (i)) | 32 | #define atomic_set(v,i) (((v)->counter) = (i)) |
33 | 33 | ||
34 | extern __inline__ int atomic_add_return (int i, volatile atomic_t *v) | 34 | static inline int atomic_add_return (int i, volatile atomic_t *v) |
35 | { | 35 | { |
36 | unsigned long flags; | 36 | unsigned long flags; |
37 | int res; | 37 | int res; |
diff --git a/include/asm-v850/bitops.h b/include/asm-v850/bitops.h index 0e5c2f210872..b91e799763fd 100644 --- a/include/asm-v850/bitops.h +++ b/include/asm-v850/bitops.h | |||
@@ -30,7 +30,7 @@ | |||
30 | * ffz = Find First Zero in word. Undefined if no zero exists, | 30 | * ffz = Find First Zero in word. Undefined if no zero exists, |
31 | * so code should check against ~0UL first.. | 31 | * so code should check against ~0UL first.. |
32 | */ | 32 | */ |
33 | extern __inline__ unsigned long ffz (unsigned long word) | 33 | static inline unsigned long ffz (unsigned long word) |
34 | { | 34 | { |
35 | unsigned long result = 0; | 35 | unsigned long result = 0; |
36 | 36 | ||
@@ -135,7 +135,7 @@ extern __inline__ unsigned long ffz (unsigned long word) | |||
135 | "m" (*((const char *)(addr) + ((nr) >> 3)))); \ | 135 | "m" (*((const char *)(addr) + ((nr) >> 3)))); \ |
136 | __test_bit_res; \ | 136 | __test_bit_res; \ |
137 | }) | 137 | }) |
138 | extern __inline__ int __test_bit (int nr, const void *addr) | 138 | static inline int __test_bit (int nr, const void *addr) |
139 | { | 139 | { |
140 | int res; | 140 | int res; |
141 | __asm__ __volatile__ ("tst1 %1, [%2]; setf nz, %0" | 141 | __asm__ __volatile__ ("tst1 %1, [%2]; setf nz, %0" |
@@ -157,7 +157,7 @@ extern __inline__ int __test_bit (int nr, const void *addr) | |||
157 | #define find_first_zero_bit(addr, size) \ | 157 | #define find_first_zero_bit(addr, size) \ |
158 | find_next_zero_bit ((addr), (size), 0) | 158 | find_next_zero_bit ((addr), (size), 0) |
159 | 159 | ||
160 | extern __inline__ int find_next_zero_bit(const void *addr, int size, int offset) | 160 | static inline int find_next_zero_bit(const void *addr, int size, int offset) |
161 | { | 161 | { |
162 | unsigned long *p = ((unsigned long *) addr) + (offset >> 5); | 162 | unsigned long *p = ((unsigned long *) addr) + (offset >> 5); |
163 | unsigned long result = offset & ~31UL; | 163 | unsigned long result = offset & ~31UL; |
diff --git a/include/asm-v850/delay.h b/include/asm-v850/delay.h index 1ce65d48a7c5..6d028e6b2354 100644 --- a/include/asm-v850/delay.h +++ b/include/asm-v850/delay.h | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #include <asm/param.h> | 17 | #include <asm/param.h> |
18 | 18 | ||
19 | extern __inline__ void __delay(unsigned long loops) | 19 | static inline void __delay(unsigned long loops) |
20 | { | 20 | { |
21 | if (loops) | 21 | if (loops) |
22 | __asm__ __volatile__ ("1: add -1, %0; bnz 1b" | 22 | __asm__ __volatile__ ("1: add -1, %0; bnz 1b" |
@@ -33,7 +33,7 @@ extern __inline__ void __delay(unsigned long loops) | |||
33 | 33 | ||
34 | extern unsigned long loops_per_jiffy; | 34 | extern unsigned long loops_per_jiffy; |
35 | 35 | ||
36 | extern __inline__ void udelay(unsigned long usecs) | 36 | static inline void udelay(unsigned long usecs) |
37 | { | 37 | { |
38 | register unsigned long full_loops, part_loops; | 38 | register unsigned long full_loops, part_loops; |
39 | 39 | ||
diff --git a/include/asm-v850/hw_irq.h b/include/asm-v850/hw_irq.h index 4bdc98edb9f8..a8aab4342712 100644 --- a/include/asm-v850/hw_irq.h +++ b/include/asm-v850/hw_irq.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __V850_HW_IRQ_H__ | 1 | #ifndef __V850_HW_IRQ_H__ |
2 | #define __V850_HW_IRQ_H__ | 2 | #define __V850_HW_IRQ_H__ |
3 | 3 | ||
4 | extern inline void hw_resend_irq (struct hw_interrupt_type *h, unsigned int i) | 4 | static inline void hw_resend_irq (struct hw_interrupt_type *h, unsigned int i) |
5 | { | 5 | { |
6 | } | 6 | } |
7 | 7 | ||
diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h index d41f925f5182..98f929427d3d 100644 --- a/include/asm-v850/processor.h +++ b/include/asm-v850/processor.h | |||
@@ -59,7 +59,7 @@ struct thread_struct { | |||
59 | 59 | ||
60 | 60 | ||
61 | /* Do necessary setup to start up a newly executed thread. */ | 61 | /* Do necessary setup to start up a newly executed thread. */ |
62 | extern inline void start_thread (struct pt_regs *regs, | 62 | static inline void start_thread (struct pt_regs *regs, |
63 | unsigned long pc, unsigned long usp) | 63 | unsigned long pc, unsigned long usp) |
64 | { | 64 | { |
65 | regs->pc = pc; | 65 | regs->pc = pc; |
@@ -68,7 +68,7 @@ extern inline void start_thread (struct pt_regs *regs, | |||
68 | } | 68 | } |
69 | 69 | ||
70 | /* Free all resources held by a thread. */ | 70 | /* Free all resources held by a thread. */ |
71 | extern inline void release_thread (struct task_struct *dead_task) | 71 | static inline void release_thread (struct task_struct *dead_task) |
72 | { | 72 | { |
73 | } | 73 | } |
74 | 74 | ||
diff --git a/include/asm-v850/semaphore.h b/include/asm-v850/semaphore.h index df6cdecf6c1f..735baaf3a16e 100644 --- a/include/asm-v850/semaphore.h +++ b/include/asm-v850/semaphore.h | |||
@@ -24,7 +24,7 @@ struct semaphore { | |||
24 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC (name,1) | 24 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC (name,1) |
25 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC (name,0) | 25 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC (name,0) |
26 | 26 | ||
27 | extern inline void sema_init (struct semaphore *sem, int val) | 27 | static inline void sema_init (struct semaphore *sem, int val) |
28 | { | 28 | { |
29 | *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val); | 29 | *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val); |
30 | } | 30 | } |
@@ -52,14 +52,14 @@ extern int __down_interruptible (struct semaphore * sem); | |||
52 | extern int __down_trylock (struct semaphore * sem); | 52 | extern int __down_trylock (struct semaphore * sem); |
53 | extern void __up (struct semaphore * sem); | 53 | extern void __up (struct semaphore * sem); |
54 | 54 | ||
55 | extern inline void down (struct semaphore * sem) | 55 | static inline void down (struct semaphore * sem) |
56 | { | 56 | { |
57 | might_sleep(); | 57 | might_sleep(); |
58 | if (atomic_dec_return (&sem->count) < 0) | 58 | if (atomic_dec_return (&sem->count) < 0) |
59 | __down (sem); | 59 | __down (sem); |
60 | } | 60 | } |
61 | 61 | ||
62 | extern inline int down_interruptible (struct semaphore * sem) | 62 | static inline int down_interruptible (struct semaphore * sem) |
63 | { | 63 | { |
64 | int ret = 0; | 64 | int ret = 0; |
65 | might_sleep(); | 65 | might_sleep(); |
@@ -68,7 +68,7 @@ extern inline int down_interruptible (struct semaphore * sem) | |||
68 | return ret; | 68 | return ret; |
69 | } | 69 | } |
70 | 70 | ||
71 | extern inline int down_trylock (struct semaphore *sem) | 71 | static inline int down_trylock (struct semaphore *sem) |
72 | { | 72 | { |
73 | int ret = 0; | 73 | int ret = 0; |
74 | if (atomic_dec_return (&sem->count) < 0) | 74 | if (atomic_dec_return (&sem->count) < 0) |
@@ -76,7 +76,7 @@ extern inline int down_trylock (struct semaphore *sem) | |||
76 | return ret; | 76 | return ret; |
77 | } | 77 | } |
78 | 78 | ||
79 | extern inline void up (struct semaphore * sem) | 79 | static inline void up (struct semaphore * sem) |
80 | { | 80 | { |
81 | if (atomic_inc_return (&sem->count) <= 0) | 81 | if (atomic_inc_return (&sem->count) <= 0) |
82 | __up (sem); | 82 | __up (sem); |
diff --git a/include/asm-v850/system.h b/include/asm-v850/system.h index 20f4c738c04e..107decbd6e6c 100644 --- a/include/asm-v850/system.h +++ b/include/asm-v850/system.h | |||
@@ -81,7 +81,7 @@ static inline int irqs_disabled (void) | |||
81 | ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr)))) | 81 | ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr)))) |
82 | #define tas(ptr) (xchg ((ptr), 1)) | 82 | #define tas(ptr) (xchg ((ptr), 1)) |
83 | 83 | ||
84 | extern inline unsigned long __xchg (unsigned long with, | 84 | static inline unsigned long __xchg (unsigned long with, |
85 | __volatile__ void *ptr, int size) | 85 | __volatile__ void *ptr, int size) |
86 | { | 86 | { |
87 | unsigned long tmp, flags; | 87 | unsigned long tmp, flags; |
diff --git a/include/asm-v850/tlbflush.h b/include/asm-v850/tlbflush.h index 501e4498172c..5f2f85f636ea 100644 --- a/include/asm-v850/tlbflush.h +++ b/include/asm-v850/tlbflush.h | |||
@@ -56,12 +56,12 @@ static inline void flush_tlb_range(struct vm_area_struct *vma, | |||
56 | BUG (); | 56 | BUG (); |
57 | } | 57 | } |
58 | 58 | ||
59 | extern inline void flush_tlb_kernel_page(unsigned long addr) | 59 | static inline void flush_tlb_kernel_page(unsigned long addr) |
60 | { | 60 | { |
61 | BUG (); | 61 | BUG (); |
62 | } | 62 | } |
63 | 63 | ||
64 | extern inline void flush_tlb_pgtables(struct mm_struct *mm, | 64 | static inline void flush_tlb_pgtables(struct mm_struct *mm, |
65 | unsigned long start, unsigned long end) | 65 | unsigned long start, unsigned long end) |
66 | { | 66 | { |
67 | BUG (); | 67 | BUG (); |
diff --git a/include/asm-v850/uaccess.h b/include/asm-v850/uaccess.h index 188b28597cf1..64563c409bb2 100644 --- a/include/asm-v850/uaccess.h +++ b/include/asm-v850/uaccess.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #define VERIFY_READ 0 | 14 | #define VERIFY_READ 0 |
15 | #define VERIFY_WRITE 1 | 15 | #define VERIFY_WRITE 1 |
16 | 16 | ||
17 | extern inline int access_ok (int type, const void *addr, unsigned long size) | 17 | static inline int access_ok (int type, const void *addr, unsigned long size) |
18 | { | 18 | { |
19 | /* XXX I guess we should check against real ram bounds at least, and | 19 | /* XXX I guess we should check against real ram bounds at least, and |
20 | possibly make sure ADDR is not within the kernel. | 20 | possibly make sure ADDR is not within the kernel. |
diff --git a/include/asm-v850/unaligned.h b/include/asm-v850/unaligned.h index 65e38362142b..e30b18653a94 100644 --- a/include/asm-v850/unaligned.h +++ b/include/asm-v850/unaligned.h | |||
@@ -82,19 +82,19 @@ extern int __bug_unaligned_x(void *ptr); | |||
82 | }) | 82 | }) |
83 | 83 | ||
84 | 84 | ||
85 | extern inline void __put_unaligned_2(__u32 __v, register __u8 *__p) | 85 | static inline void __put_unaligned_2(__u32 __v, register __u8 *__p) |
86 | { | 86 | { |
87 | *__p++ = __v; | 87 | *__p++ = __v; |
88 | *__p++ = __v >> 8; | 88 | *__p++ = __v >> 8; |
89 | } | 89 | } |
90 | 90 | ||
91 | extern inline void __put_unaligned_4(__u32 __v, register __u8 *__p) | 91 | static inline void __put_unaligned_4(__u32 __v, register __u8 *__p) |
92 | { | 92 | { |
93 | __put_unaligned_2(__v >> 16, __p + 2); | 93 | __put_unaligned_2(__v >> 16, __p + 2); |
94 | __put_unaligned_2(__v, __p); | 94 | __put_unaligned_2(__v, __p); |
95 | } | 95 | } |
96 | 96 | ||
97 | extern inline void __put_unaligned_8(const unsigned long long __v, register __u8 *__p) | 97 | static inline void __put_unaligned_8(const unsigned long long __v, register __u8 *__p) |
98 | { | 98 | { |
99 | /* | 99 | /* |
100 | * tradeoff: 8 bytes of stack for all unaligned puts (2 | 100 | * tradeoff: 8 bytes of stack for all unaligned puts (2 |