Created
August 7, 2015 07:08
-
-
Save kraj/93794ad61a29d0a5e442 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From bd961db0e42d85a4ddf594c0fac8aeb77d619e40 Mon Sep 17 00:00:00 2001 | |
From: Khem Raj <raj.khem@gmail.com> | |
Date: Fri, 7 Aug 2015 00:05:29 -0700 | |
Subject: [PATCH] PowerPC: change 'extern inline' to 'static inline' | |
The gcc 5 change its default C standard from gnu89 to gnu11. | |
extern inline semantics have changed see | |
https://gcc.gnu.org/gcc-5/porting_to.html | |
Signed-off-by: Khem Raj <raj.khem@gmail.com> | |
--- | |
arch/powerpc/include/asm/io.h | 20 ++++++++++---------- | |
1 file changed, 10 insertions(+), 10 deletions(-) | |
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h | |
index a5257e9..a54fc46 100644 | |
--- a/arch/powerpc/include/asm/io.h | |
+++ b/arch/powerpc/include/asm/io.h | |
@@ -163,7 +163,7 @@ static inline void __raw_writel(unsigned int v, volatile void __iomem *addr) | |
* is actually performed (i.e. the data has come back) before we start | |
* executing any following instructions. | |
*/ | |
-extern inline u8 in_8(const volatile unsigned char __iomem *addr) | |
+static inline u8 in_8(const volatile unsigned char __iomem *addr) | |
{ | |
u8 ret; | |
@@ -174,7 +174,7 @@ extern inline u8 in_8(const volatile unsigned char __iomem *addr) | |
return ret; | |
} | |
-extern inline void out_8(volatile unsigned char __iomem *addr, u8 val) | |
+static inline void out_8(volatile unsigned char __iomem *addr, u8 val) | |
{ | |
__asm__ __volatile__("sync;\n" | |
"stb%U0%X0 %1,%0;\n" | |
@@ -182,7 +182,7 @@ extern inline void out_8(volatile unsigned char __iomem *addr, u8 val) | |
: "r" (val)); | |
} | |
-extern inline u16 in_le16(const volatile unsigned short __iomem *addr) | |
+static inline u16 in_le16(const volatile unsigned short __iomem *addr) | |
{ | |
u16 ret; | |
@@ -193,7 +193,7 @@ extern inline u16 in_le16(const volatile unsigned short __iomem *addr) | |
return ret; | |
} | |
-extern inline u16 in_be16(const volatile unsigned short __iomem *addr) | |
+static inline u16 in_be16(const volatile unsigned short __iomem *addr) | |
{ | |
u16 ret; | |
@@ -203,18 +203,18 @@ extern inline u16 in_be16(const volatile unsigned short __iomem *addr) | |
return ret; | |
} | |
-extern inline void out_le16(volatile unsigned short __iomem *addr, u16 val) | |
+static inline void out_le16(volatile unsigned short __iomem *addr, u16 val) | |
{ | |
__asm__ __volatile__("sync; sthbrx %1,0,%2" : "=m" (*addr) : | |
"r" (val), "r" (addr)); | |
} | |
-extern inline void out_be16(volatile unsigned short __iomem *addr, u16 val) | |
+static inline void out_be16(volatile unsigned short __iomem *addr, u16 val) | |
{ | |
__asm__ __volatile__("sync; sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val)); | |
} | |
-extern inline u32 in_le32(const volatile unsigned __iomem *addr) | |
+static inline u32 in_le32(const volatile unsigned __iomem *addr) | |
{ | |
u32 ret; | |
@@ -225,7 +225,7 @@ extern inline u32 in_le32(const volatile unsigned __iomem *addr) | |
return ret; | |
} | |
-extern inline u32 in_be32(const volatile unsigned __iomem *addr) | |
+static inline u32 in_be32(const volatile unsigned __iomem *addr) | |
{ | |
u32 ret; | |
@@ -235,13 +235,13 @@ extern inline u32 in_be32(const volatile unsigned __iomem *addr) | |
return ret; | |
} | |
-extern inline void out_le32(volatile unsigned __iomem *addr, u32 val) | |
+static inline void out_le32(volatile unsigned __iomem *addr, u32 val) | |
{ | |
__asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr) : | |
"r" (val), "r" (addr)); | |
} | |
-extern inline void out_be32(volatile unsigned __iomem *addr, u32 val) | |
+static inline void out_be32(volatile unsigned __iomem *addr, u32 val) | |
{ | |
__asm__ __volatile__("sync; stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val)); | |
} | |
-- | |
2.1.4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment