diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 12:27:10 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 20:43:06 +0400 |
| commit | b21d4b08b6686fa13bf9d4cae1ae08cb23ea3d53 (patch) | |
| tree | a67bc7e6388083ef6a31e58ab12d4f3c10d8f536 /include/asm-um | |
| parent | 3cdaf45578b9aa1eb748d0a32678ee5a0180575b (diff) | |
| download | linux-b21d4b08b6686fa13bf9d4cae1ae08cb23ea3d53.tar.xz | |
uml: fix inlines
"extern inline" will have different semantics with gcc 4.3.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-um')
| -rw-r--r-- | include/asm-um/pgalloc.h | 2 | ||||
| -rw-r--r-- | include/asm-um/pgtable-3level.h | 2 | ||||
| -rw-r--r-- | include/asm-um/processor-x86_64.h | 2 | ||||
| -rw-r--r-- | include/asm-um/smp.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-um/pgalloc.h b/include/asm-um/pgalloc.h index 34ab268ef40e..14904876e8fb 100644 --- a/include/asm-um/pgalloc.h +++ b/include/asm-um/pgalloc.h @@ -42,7 +42,7 @@ static inline void pte_free(struct page *pte) #ifdef CONFIG_3_LEVEL_PGTABLES -extern __inline__ void pmd_free(pmd_t *pmd) +static inline void pmd_free(pmd_t *pmd) { free_page((unsigned long)pmd); } diff --git a/include/asm-um/pgtable-3level.h b/include/asm-um/pgtable-3level.h index ca0c2a92a112..aa82b88db805 100644 --- a/include/asm-um/pgtable-3level.h +++ b/include/asm-um/pgtable-3level.h @@ -69,7 +69,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) return pmd; } -extern inline void pud_clear (pud_t *pud) +static inline void pud_clear (pud_t *pud) { set_pud(pud, __pud(0)); } diff --git a/include/asm-um/processor-x86_64.h b/include/asm-um/processor-x86_64.h index 31c2d4d685bd..d946bf2d334a 100644 --- a/include/asm-um/processor-x86_64.h +++ b/include/asm-um/processor-x86_64.h @@ -18,7 +18,7 @@ struct arch_thread { }; /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ -extern inline void rep_nop(void) +static inline void rep_nop(void) { __asm__ __volatile__("rep;nop": : :"memory"); } diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h index 84f8cf29324e..f27a96313174 100644 --- a/include/asm-um/smp.h +++ b/include/asm-um/smp.h @@ -18,7 +18,7 @@ extern int hard_smp_processor_id(void); extern int ncpus; -extern inline void smp_cpus_done(unsigned int maxcpus) +static inline void smp_cpus_done(unsigned int maxcpus) { } |