projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
io.h
diff --git
a/arch/powerpc/include/asm/io.h
b/arch/powerpc/include/asm/io.h
index ec0bfaee9912b429c1a1c858826a793da0aebdf9..1f12c29ba8351584974052d97d292de57c786cd4 100644
(file)
--- a/
arch/powerpc/include/asm/io.h
+++ b/
arch/powerpc/include/asm/io.h
@@
-127,7
+127,6
@@
static inline void isync(void)
/*
* Non ordered and non-swapping "raw" accessors
*/
/*
* Non ordered and non-swapping "raw" accessors
*/
-#define __iomem
#define PCI_FIX_ADDR(addr) (addr)
static inline unsigned char __raw_readb(const volatile void __iomem *addr)
#define PCI_FIX_ADDR(addr) (addr)
static inline unsigned char __raw_readb(const volatile void __iomem *addr)
@@
-162,7
+161,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.
*/
* is actually performed (i.e. the data has come back) before we start
* executing any following instructions.
*/
-
static
inline u8 in_8(const volatile unsigned char __iomem *addr)
+
extern
inline u8 in_8(const volatile unsigned char __iomem *addr)
{
u8 ret;
{
u8 ret;
@@
-173,7
+172,7
@@
static inline u8 in_8(const volatile unsigned char __iomem *addr)
return ret;
}
return ret;
}
-
static
inline void out_8(volatile unsigned char __iomem *addr, u8 val)
+
extern
inline void out_8(volatile unsigned char __iomem *addr, u8 val)
{
__asm__ __volatile__("sync;\n"
"stb%U0%X0 %1,%0;\n"
{
__asm__ __volatile__("sync;\n"
"stb%U0%X0 %1,%0;\n"
@@
-181,7
+180,7
@@
static inline void out_8(volatile unsigned char __iomem *addr, u8 val)
: "r" (val));
}
: "r" (val));
}
-
static
inline u16 in_le16(const volatile unsigned short __iomem *addr)
+
extern
inline u16 in_le16(const volatile unsigned short __iomem *addr)
{
u16 ret;
{
u16 ret;
@@
-192,7
+191,7
@@
static inline u16 in_le16(const volatile unsigned short __iomem *addr)
return ret;
}
return ret;
}
-
static
inline u16 in_be16(const volatile unsigned short __iomem *addr)
+
extern
inline u16 in_be16(const volatile unsigned short __iomem *addr)
{
u16 ret;
{
u16 ret;
@@
-202,18
+201,18
@@
static inline u16 in_be16(const volatile unsigned short __iomem *addr)
return ret;
}
return ret;
}
-
static
inline void out_le16(volatile unsigned short __iomem *addr, u16 val)
+
extern
inline void out_le16(volatile unsigned short __iomem *addr, u16 val)
{
__asm__ __volatile__("sync; sthbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
{
__asm__ __volatile__("sync; sthbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
-
static
inline void out_be16(volatile unsigned short __iomem *addr, u16 val)
+
extern
inline void out_be16(volatile unsigned short __iomem *addr, u16 val)
{
__asm__ __volatile__("sync; sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}
{
__asm__ __volatile__("sync; sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}
-
static
inline u32 in_le32(const volatile unsigned __iomem *addr)
+
extern
inline u32 in_le32(const volatile unsigned __iomem *addr)
{
u32 ret;
{
u32 ret;
@@
-224,7
+223,7
@@
static inline u32 in_le32(const volatile unsigned __iomem *addr)
return ret;
}
return ret;
}
-
static
inline u32 in_be32(const volatile unsigned __iomem *addr)
+
extern
inline u32 in_be32(const volatile unsigned __iomem *addr)
{
u32 ret;
{
u32 ret;
@@
-234,13
+233,13
@@
static inline u32 in_be32(const volatile unsigned __iomem *addr)
return ret;
}
return ret;
}
-
static
inline void out_le32(volatile unsigned __iomem *addr, u32 val)
+
extern
inline void out_le32(volatile unsigned __iomem *addr, u32 val)
{
__asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
{
__asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr) :
"r" (val), "r" (addr));
}
-
static
inline void out_be32(volatile unsigned __iomem *addr, u32 val)
+
extern
inline void out_be32(volatile unsigned __iomem *addr, u32 val)
{
__asm__ __volatile__("sync; stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}
{
__asm__ __volatile__("sync; stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
}