Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b21d4b08 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: fix inlines 



"extern inline" will have different semantics with gcc 4.3.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3cdaf455

include/asm-um/pgalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

include/asm-um/pgtable-3level.h

+1 −1
Original line number Diff line number Diff line
@@ -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));

}

include/asm-um/processor-x86_64.h

+1 −1
Original line number Diff line number Diff line
@@ -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");

}

include/asm-um/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

}