aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 04:27:10 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:06 -0400
commitb21d4b08b6686fa13bf9d4cae1ae08cb23ea3d53 (patch)
treea67bc7e6388083ef6a31e58ab12d4f3c10d8f536 /include
parent3cdaf45578b9aa1eb748d0a32678ee5a0180575b (diff)
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')
-rw-r--r--include/asm-um/pgalloc.h2
-rw-r--r--include/asm-um/pgtable-3level.h2
-rw-r--r--include/asm-um/processor-x86_64.h2
-rw-r--r--include/asm-um/smp.h2
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)
42 42
43#ifdef CONFIG_3_LEVEL_PGTABLES 43#ifdef CONFIG_3_LEVEL_PGTABLES
44 44
45extern __inline__ void pmd_free(pmd_t *pmd) 45static inline void pmd_free(pmd_t *pmd)
46{ 46{
47 free_page((unsigned long)pmd); 47 free_page((unsigned long)pmd);
48} 48}
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)
69 return pmd; 69 return pmd;
70} 70}
71 71
72extern inline void pud_clear (pud_t *pud) 72static inline void pud_clear (pud_t *pud)
73{ 73{
74 set_pud(pud, __pud(0)); 74 set_pud(pud, __pud(0));
75} 75}
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 {
18}; 18};
19 19
20/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ 20/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
21extern inline void rep_nop(void) 21static inline void rep_nop(void)
22{ 22{
23 __asm__ __volatile__("rep;nop": : :"memory"); 23 __asm__ __volatile__("rep;nop": : :"memory");
24} 24}
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);
18extern int ncpus; 18extern int ncpus;
19 19
20 20
21extern inline void smp_cpus_done(unsigned int maxcpus) 21static inline void smp_cpus_done(unsigned int maxcpus)
22{ 22{
23} 23}
24 24