diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-11-07 03:58:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:30 -0500 |
commit | d9b5444eeb3a663ca4a625878b1421c9e9b18e8b (patch) | |
tree | 6cc32711116977944043c54e0c196c75358916be /arch/cris | |
parent | 5f9c3cbcd5d41be597aef9c0ff64ebfc8a91cd6f (diff) |
[PATCH] cris: "extern inline" -> "static inline"
"extern inline" doesn't make much sense.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/README.mm | 6 | ||||
-rw-r--r-- | arch/cris/arch-v10/kernel/signal.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 2 | ||||
-rw-r--r-- | arch/cris/mm/ioremap.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/cris/arch-v10/README.mm b/arch/cris/arch-v10/README.mm index 6f08903f3139..517d1f027fe8 100644 --- a/arch/cris/arch-v10/README.mm +++ b/arch/cris/arch-v10/README.mm | |||
@@ -177,7 +177,7 @@ The example address is 0xd004000c; in binary this is: | |||
177 | Given the top-level Page Directory, the offset in that directory is calculated | 177 | Given the top-level Page Directory, the offset in that directory is calculated |
178 | using the upper 8 bits: | 178 | using the upper 8 bits: |
179 | 179 | ||
180 | extern inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address) | 180 | static inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address) |
181 | { | 181 | { |
182 | return mm->pgd + (address >> PGDIR_SHIFT); | 182 | return mm->pgd + (address >> PGDIR_SHIFT); |
183 | } | 183 | } |
@@ -190,14 +190,14 @@ The pgd_t from our example will therefore be the 208'th (0xd0) entry in mm->pgd. | |||
190 | 190 | ||
191 | Since the Middle Directory does not exist, it is a unity mapping: | 191 | Since the Middle Directory does not exist, it is a unity mapping: |
192 | 192 | ||
193 | extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address) | 193 | static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address) |
194 | { | 194 | { |
195 | return (pmd_t *) dir; | 195 | return (pmd_t *) dir; |
196 | } | 196 | } |
197 | 197 | ||
198 | The Page Table provides the final lookup by using bits 13 to 23 as index: | 198 | The Page Table provides the final lookup by using bits 13 to 23 as index: |
199 | 199 | ||
200 | extern inline pte_t * pte_offset(pmd_t * dir, unsigned long address) | 200 | static inline pte_t * pte_offset(pmd_t * dir, unsigned long address) |
201 | { | 201 | { |
202 | return (pte_t *) pmd_page(*dir) + ((address >> PAGE_SHIFT) & | 202 | return (pte_t *) pmd_page(*dir) + ((address >> PAGE_SHIFT) & |
203 | (PTRS_PER_PTE - 1)); | 203 | (PTRS_PER_PTE - 1)); |
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index 693771961f85..19bcad05716f 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c | |||
@@ -476,7 +476,7 @@ give_sigsegv: | |||
476 | * OK, we're invoking a handler | 476 | * OK, we're invoking a handler |
477 | */ | 477 | */ |
478 | 478 | ||
479 | extern inline void | 479 | static inline void |
480 | handle_signal(int canrestart, unsigned long sig, | 480 | handle_signal(int canrestart, unsigned long sig, |
481 | siginfo_t *info, struct k_sigaction *ka, | 481 | siginfo_t *info, struct k_sigaction *ka, |
482 | sigset_t *oldset, struct pt_regs * regs) | 482 | sigset_t *oldset, struct pt_regs * regs) |
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 0a3614dab887..99e59b3eacf8 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
@@ -513,7 +513,7 @@ give_sigsegv: | |||
513 | } | 513 | } |
514 | 514 | ||
515 | /* Invoke a singal handler to, well, handle the signal. */ | 515 | /* Invoke a singal handler to, well, handle the signal. */ |
516 | extern inline void | 516 | static inline void |
517 | handle_signal(int canrestart, unsigned long sig, | 517 | handle_signal(int canrestart, unsigned long sig, |
518 | siginfo_t *info, struct k_sigaction *ka, | 518 | siginfo_t *info, struct k_sigaction *ka, |
519 | sigset_t *oldset, struct pt_regs * regs) | 519 | sigset_t *oldset, struct pt_regs * regs) |
diff --git a/arch/cris/mm/ioremap.c b/arch/cris/mm/ioremap.c index a92ac9877582..1780df3ed9e5 100644 --- a/arch/cris/mm/ioremap.c +++ b/arch/cris/mm/ioremap.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <asm/tlbflush.h> | 16 | #include <asm/tlbflush.h> |
17 | #include <asm/arch/memmap.h> | 17 | #include <asm/arch/memmap.h> |
18 | 18 | ||
19 | extern inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size, | 19 | static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size, |
20 | unsigned long phys_addr, pgprot_t prot) | 20 | unsigned long phys_addr, pgprot_t prot) |
21 | { | 21 | { |
22 | unsigned long end; | 22 | unsigned long end; |