diff options
| author | Adrian Bunk <bunk@kernel.org> | 2007-10-17 12:04:39 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:16:39 -0400 |
| commit | 95c1e9aefa5d3a2dd61304797cad96e8fdcd95ce (patch) | |
| tree | d59a6477e21ab1d0850e85403d6211b7c576de70 /include/asm-x86 | |
| parent | 98c9e27a56a2d9f9148992b0b9a9a36760ea4eb9 (diff) | |
x86: visws extern inline to static inline
"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>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/mach-visws/cobalt.h | 8 | ||||
| -rw-r--r-- | include/asm-x86/mach-visws/lithium.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-x86/mach-visws/cobalt.h b/include/asm-x86/mach-visws/cobalt.h index 33c36225a042..995258831b7f 100644 --- a/include/asm-x86/mach-visws/cobalt.h +++ b/include/asm-x86/mach-visws/cobalt.h | |||
| @@ -94,22 +94,22 @@ | |||
| 94 | #define CO_IRQ_8259 CO_IRQ(CO_APIC_8259) | 94 | #define CO_IRQ_8259 CO_IRQ(CO_APIC_8259) |
| 95 | 95 | ||
| 96 | #ifdef CONFIG_X86_VISWS_APIC | 96 | #ifdef CONFIG_X86_VISWS_APIC |
| 97 | extern __inline void co_cpu_write(unsigned long reg, unsigned long v) | 97 | static inline void co_cpu_write(unsigned long reg, unsigned long v) |
| 98 | { | 98 | { |
| 99 | *((volatile unsigned long *)(CO_CPU_VADDR+reg))=v; | 99 | *((volatile unsigned long *)(CO_CPU_VADDR+reg))=v; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | extern __inline unsigned long co_cpu_read(unsigned long reg) | 102 | static inline unsigned long co_cpu_read(unsigned long reg) |
| 103 | { | 103 | { |
| 104 | return *((volatile unsigned long *)(CO_CPU_VADDR+reg)); | 104 | return *((volatile unsigned long *)(CO_CPU_VADDR+reg)); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | extern __inline void co_apic_write(unsigned long reg, unsigned long v) | 107 | static inline void co_apic_write(unsigned long reg, unsigned long v) |
| 108 | { | 108 | { |
| 109 | *((volatile unsigned long *)(CO_APIC_VADDR+reg))=v; | 109 | *((volatile unsigned long *)(CO_APIC_VADDR+reg))=v; |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | extern __inline unsigned long co_apic_read(unsigned long reg) | 112 | static inline unsigned long co_apic_read(unsigned long reg) |
| 113 | { | 113 | { |
| 114 | return *((volatile unsigned long *)(CO_APIC_VADDR+reg)); | 114 | return *((volatile unsigned long *)(CO_APIC_VADDR+reg)); |
| 115 | } | 115 | } |
diff --git a/include/asm-x86/mach-visws/lithium.h b/include/asm-x86/mach-visws/lithium.h index d443e68d0066..dfcd4f07ab85 100644 --- a/include/asm-x86/mach-visws/lithium.h +++ b/include/asm-x86/mach-visws/lithium.h | |||
| @@ -29,22 +29,22 @@ | |||
| 29 | #define LI_INTD 0x0080 | 29 | #define LI_INTD 0x0080 |
| 30 | 30 | ||
| 31 | /* More special purpose macros... */ | 31 | /* More special purpose macros... */ |
| 32 | extern __inline void li_pcia_write16(unsigned long reg, unsigned short v) | 32 | static inline void li_pcia_write16(unsigned long reg, unsigned short v) |
| 33 | { | 33 | { |
| 34 | *((volatile unsigned short *)(LI_PCIA_VADDR+reg))=v; | 34 | *((volatile unsigned short *)(LI_PCIA_VADDR+reg))=v; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | extern __inline unsigned short li_pcia_read16(unsigned long reg) | 37 | static inline unsigned short li_pcia_read16(unsigned long reg) |
| 38 | { | 38 | { |
| 39 | return *((volatile unsigned short *)(LI_PCIA_VADDR+reg)); | 39 | return *((volatile unsigned short *)(LI_PCIA_VADDR+reg)); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | extern __inline void li_pcib_write16(unsigned long reg, unsigned short v) | 42 | static inline void li_pcib_write16(unsigned long reg, unsigned short v) |
| 43 | { | 43 | { |
| 44 | *((volatile unsigned short *)(LI_PCIB_VADDR+reg))=v; | 44 | *((volatile unsigned short *)(LI_PCIB_VADDR+reg))=v; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | extern __inline unsigned short li_pcib_read16(unsigned long reg) | 47 | static inline unsigned short li_pcib_read16(unsigned long reg) |
| 48 | { | 48 | { |
| 49 | return *((volatile unsigned short *)(LI_PCIB_VADDR+reg)); | 49 | return *((volatile unsigned short *)(LI_PCIB_VADDR+reg)); |
| 50 | } | 50 | } |