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

Commit 9c0aa0f9 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] Replace extern inline with static inline in asm-x86_64/* 



They should be identical in the kernel now, but this
makes it consistent with other code.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 47e5701e

include/asm-x86_64/desc.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static inline void load_TLS(struct thread_struct *t, unsigned int cpu) 
/*

 * load one particular LDT into the current CPU

 */

extern inline void load_LDT_nolock (mm_context_t *pc, int cpu)

static inline void load_LDT_nolock (mm_context_t *pc, int cpu)

{

	int count = pc->size;

include/asm-x86_64/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ extern void __this_fixmap_does_not_exist(void); 
 * directly without translation, we catch the bug with a NULL-deference

 * kernel oops. Illegal ranges of incoming indices are caught too.

 */

extern inline unsigned long fix_to_virt(const unsigned int idx)

static inline unsigned long fix_to_virt(const unsigned int idx)

{

	/*

	 * this branch gets completely eliminated after inlining,

include/asm-x86_64/io.h

+7 −7
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 * Talk about misusing macros..

 */

#define __OUT1(s,x) \

extern inline void out##s(unsigned x value, unsigned short port) {

static inline void out##s(unsigned x value, unsigned short port) {



#define __OUT2(s,s1,s2) \

__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
@@ -58,7 +58,7 @@ __OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "Nd" (port)); } \ 
__OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));} \



#define __IN1(s) \

extern inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;

static inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;



#define __IN2(s,s1,s2) \

__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
@@ -68,12 +68,12 @@ __IN1(s) __IN2(s,s1,"w") : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \ 
__IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \



#define __INS(s) \

extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \

static inline void ins##s(unsigned short port, void * addr, unsigned long count) \

{ __asm__ __volatile__ ("rep ; ins" #s \

: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }



#define __OUTS(s) \

extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \

static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \

{ __asm__ __volatile__ ("rep ; outs" #s \

: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
@@ -110,12 +110,12 @@ __OUTS(l) 
 * Change virtual addresses to physical addresses and vv.

 * These are pretty trivial

 */

extern inline unsigned long virt_to_phys(volatile void * address)

static inline unsigned long virt_to_phys(volatile void * address)

{

	return __pa(address);

}



extern inline void * phys_to_virt(unsigned long address)

static inline void * phys_to_virt(unsigned long address)

{

	return __va(address);

}
@@ -130,7 +130,7 @@ extern inline void * phys_to_virt(unsigned long address) 


extern void __iomem *__ioremap(unsigned long offset, unsigned long size, unsigned long flags);



extern inline void __iomem * ioremap (unsigned long offset, unsigned long size)

static inline void __iomem * ioremap (unsigned long offset, unsigned long size)

{

	return __ioremap(offset, size, 0);

}

include/asm-x86_64/msr.h

+5 −5
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
			  : "=a" (low), "=d" (high) \

			  : "c" (counter))



extern inline void cpuid(int op, unsigned int *eax, unsigned int *ebx,

static inline void cpuid(int op, unsigned int *eax, unsigned int *ebx,

			 unsigned int *ecx, unsigned int *edx)

{

	__asm__("cpuid"
@@ -90,7 +90,7 @@ static inline void cpuid_count(int op, int count, int *eax, int *ebx, int *ecx, 
/*

 * CPUID functions returning a single datum

 */

extern inline unsigned int cpuid_eax(unsigned int op)

static inline unsigned int cpuid_eax(unsigned int op)

{

	unsigned int eax;
@@ -100,7 +100,7 @@ extern inline unsigned int cpuid_eax(unsigned int op) 
		: "bx", "cx", "dx");

	return eax;

}

extern inline unsigned int cpuid_ebx(unsigned int op)

static inline unsigned int cpuid_ebx(unsigned int op)

{

	unsigned int eax, ebx;
@@ -110,7 +110,7 @@ extern inline unsigned int cpuid_ebx(unsigned int op) 
		: "cx", "dx" );

	return ebx;

}

extern inline unsigned int cpuid_ecx(unsigned int op)

static inline unsigned int cpuid_ecx(unsigned int op)

{

	unsigned int eax, ecx;
@@ -120,7 +120,7 @@ extern inline unsigned int cpuid_ecx(unsigned int op) 
		: "bx", "dx" );

	return ecx;

}

extern inline unsigned int cpuid_edx(unsigned int op)

static inline unsigned int cpuid_edx(unsigned int op)

{

	unsigned int eax, edx;

include/asm-x86_64/pgalloc.h

+4 −4
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p 
	set_pmd(pmd, __pmd(_PAGE_TABLE | (page_to_pfn(pte) << PAGE_SHIFT)));

}



extern __inline__ pmd_t *get_pmd(void)

static inline pmd_t *get_pmd(void)

{

	return (pmd_t *)get_zeroed_page(GFP_KERNEL);

}



extern __inline__ void pmd_free(pmd_t *pmd)

static inline void pmd_free(pmd_t *pmd)

{

	BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));

	free_page((unsigned long)pmd);
@@ -86,13 +86,13 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add 
/* Should really implement gc for free page table pages. This could be

   done with a reference count in struct page. */



extern __inline__ void pte_free_kernel(pte_t *pte)

static inline void pte_free_kernel(pte_t *pte)

{

	BUG_ON((unsigned long)pte & (PAGE_SIZE-1));

	free_page((unsigned long)pte); 

}



extern inline void pte_free(struct page *pte)

static inline void pte_free(struct page *pte)

{

	__free_page(pte);

}