"extern inline" will have different semantics with gcc 4.3.
Signed-off-by: Adrian Bunk <[email protected]>
---
This patch has been sent on:
- 14 Aug 2007
include/asm-i386/mach-visws/cobalt.h | 8 ++++----
include/asm-i386/mach-visws/lithium.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
e12d2e797af72524f53a0ef3a7dd3cf91f58c542
diff --git a/include/asm-i386/mach-visws/cobalt.h b/include/asm-i386/mach-visws/cobalt.h
index 33c3622..9952588 100644
--- a/include/asm-i386/mach-visws/cobalt.h
+++ b/include/asm-i386/mach-visws/cobalt.h
@@ -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));
}
diff --git a/include/asm-i386/mach-visws/lithium.h b/include/asm-i386/mach-visws/lithium.h
index d443e68..dfcd4f0 100644
--- a/include/asm-i386/mach-visws/lithium.h
+++ b/include/asm-i386/mach-visws/lithium.h
@@ -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));
}
On 239, 08 27, 2007 at 11:28:19PM +0200, Adrian Bunk wrote:
> "extern inline" will have different semantics with gcc 4.3.
>
> Signed-off-by: Adrian Bunk <[email protected]>
Looks good.
Acked-by: Andrey Panin <[email protected]>
> ---
>
> This patch has been sent on:
> - 14 Aug 2007
>
> include/asm-i386/mach-visws/cobalt.h | 8 ++++----
> include/asm-i386/mach-visws/lithium.h | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> e12d2e797af72524f53a0ef3a7dd3cf91f58c542
> diff --git a/include/asm-i386/mach-visws/cobalt.h b/include/asm-i386/mach-visws/cobalt.h
> index 33c3622..9952588 100644
> --- a/include/asm-i386/mach-visws/cobalt.h
> +++ b/include/asm-i386/mach-visws/cobalt.h
> @@ -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));
> }
> diff --git a/include/asm-i386/mach-visws/lithium.h b/include/asm-i386/mach-visws/lithium.h
> index d443e68..dfcd4f0 100644
> --- a/include/asm-i386/mach-visws/lithium.h
> +++ b/include/asm-i386/mach-visws/lithium.h
> @@ -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));
> }
>
>
--
Andrey Panin | Linux and UNIX system administrator
[email protected] | PGP key: wwwkeys.pgp.net