From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934981AbXHNVnC (ORCPT ); Tue, 14 Aug 2007 17:43:02 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757243AbXHNVZt (ORCPT ); Tue, 14 Aug 2007 17:25:49 -0400 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:45833 "EHLO mailhub.stusta.mhn.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757597AbXHNVZp (ORCPT ); Tue, 14 Aug 2007 17:25:45 -0400 Date: Tue, 14 Aug 2007 23:25:36 +0200 From: Adrian Bunk To: pazke@donpac.ru Cc: linux-visws-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [2.6 patch] i386 visws: "extern inline" -> "static inline" Message-ID: <20070814212536.GU18945@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org "extern inline" will have different semantics with gcc 4.3. Signed-off-by: Adrian Bunk --- 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)); }