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

Commit 95c1e9ae authored by Adrian Bunk's avatar Adrian Bunk Committed by Thomas Gleixner
Browse files

x86: visws extern inline to static inline 



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

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarAndrey Panin <pazke@donpac.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 98c9e27a

include/asm-x86/mach-visws/cobalt.h

+4 −4
Original line number Diff line number Diff line
@@ -94,22 +94,22 @@ 
#define	CO_IRQ_8259	CO_IRQ(CO_APIC_8259)



#ifdef CONFIG_X86_VISWS_APIC

extern __inline void co_cpu_write(unsigned long reg, unsigned long v)

static inline void co_cpu_write(unsigned long reg, unsigned long v)

{

	*((volatile unsigned long *)(CO_CPU_VADDR+reg))=v;

}



extern __inline unsigned long co_cpu_read(unsigned long reg)

static inline unsigned long co_cpu_read(unsigned long reg)

{

	return *((volatile unsigned long *)(CO_CPU_VADDR+reg));

}            

             

extern __inline void co_apic_write(unsigned long reg, unsigned long v)

static inline void co_apic_write(unsigned long reg, unsigned long v)

{

	*((volatile unsigned long *)(CO_APIC_VADDR+reg))=v;

}            

             

extern __inline unsigned long co_apic_read(unsigned long reg)

static inline unsigned long co_apic_read(unsigned long reg)

{

	return *((volatile unsigned long *)(CO_APIC_VADDR+reg));

}

include/asm-x86/mach-visws/lithium.h

+4 −4
Original line number Diff line number Diff line
@@ -29,22 +29,22 @@ 
#define	LI_INTD		0x0080



/* More special purpose macros... */

extern __inline void li_pcia_write16(unsigned long reg, unsigned short v)

static inline void li_pcia_write16(unsigned long reg, unsigned short v)

{

	*((volatile unsigned short *)(LI_PCIA_VADDR+reg))=v;

}



extern __inline unsigned short li_pcia_read16(unsigned long reg)

static inline unsigned short li_pcia_read16(unsigned long reg)

{

	 return *((volatile unsigned short *)(LI_PCIA_VADDR+reg));

}



extern __inline void li_pcib_write16(unsigned long reg, unsigned short v)

static inline void li_pcib_write16(unsigned long reg, unsigned short v)

{

	*((volatile unsigned short *)(LI_PCIB_VADDR+reg))=v;

}



extern __inline unsigned short li_pcib_read16(unsigned long reg)

static inline unsigned short li_pcib_read16(unsigned long reg)

{

	return *((volatile unsigned short *)(LI_PCIB_VADDR+reg));

}