Skip to content

Commit

Permalink
x86: visws extern inline to static inline
Browse files Browse the repository at this point in the history
"extern inline" will have different semantics with gcc 4.3.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Adrian Bunk authored and Thomas Gleixner committed Oct 17, 2007
1 parent 98c9e27 commit 95c1e9a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions include/asm-x86/mach-visws/cobalt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
8 changes: 4 additions & 4 deletions include/asm-x86/mach-visws/lithium.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down

0 comments on commit 95c1e9a

Please sign in to comment.