projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../torvalds-2.6/
[cascardo/linux.git]
/
include
/
asm-x86_64
/
io.h
diff --git
a/include/asm-x86_64/io.h
b/include/asm-x86_64/io.h
index
37fc3f1
..
52ff269
100644
(file)
--- a/
include/asm-x86_64/io.h
+++ b/
include/asm-x86_64/io.h
@@
-48,7
+48,7
@@
* Talk about misusing macros..
*/
#define __OUT1(s,x) \
* Talk about misusing macros..
*/
#define __OUT1(s,x) \
-
extern
inline void out##s(unsigned x value, unsigned short port) {
+
static
inline void out##s(unsigned x value, unsigned short port) {
#define __OUT2(s,s1,s2) \
__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
#define __OUT2(s,s1,s2) \
__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
@@
-58,7
+58,7
@@
__OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "Nd" (port)); } \
__OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));} \
#define __IN1(s) \
__OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));} \
#define __IN1(s) \
-
extern
inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
+
static
inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
#define __IN2(s,s1,s2) \
__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
#define __IN2(s,s1,s2) \
__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
@@
-68,12
+68,12
@@
__IN1(s) __IN2(s,s1,"w") : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \
__IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \
#define __INS(s) \
__IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \
#define __INS(s) \
-
extern
inline void ins##s(unsigned short port, void * addr, unsigned long count) \
+
static
inline void ins##s(unsigned short port, void * addr, unsigned long count) \
{ __asm__ __volatile__ ("rep ; ins" #s \
: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
#define __OUTS(s) \
{ __asm__ __volatile__ ("rep ; ins" #s \
: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
#define __OUTS(s) \
-
extern
inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
+
static
inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
{ __asm__ __volatile__ ("rep ; outs" #s \
: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
{ __asm__ __volatile__ ("rep ; outs" #s \
: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
@@
-110,12
+110,12
@@
__OUTS(l)
* Change virtual addresses to physical addresses and vv.
* These are pretty trivial
*/
* Change virtual addresses to physical addresses and vv.
* These are pretty trivial
*/
-
extern
inline unsigned long virt_to_phys(volatile void * address)
+
static
inline unsigned long virt_to_phys(volatile void * address)
{
return __pa(address);
}
{
return __pa(address);
}
-
extern
inline void * phys_to_virt(unsigned long address)
+
static
inline void * phys_to_virt(unsigned long address)
{
return __va(address);
}
{
return __va(address);
}
@@
-130,7
+130,7
@@
extern inline void * phys_to_virt(unsigned long address)
extern void __iomem *__ioremap(unsigned long offset, unsigned long size, unsigned long flags);
extern void __iomem *__ioremap(unsigned long offset, unsigned long size, unsigned long flags);
-
extern
inline void __iomem * ioremap (unsigned long offset, unsigned long size)
+
static
inline void __iomem * ioremap (unsigned long offset, unsigned long size)
{
return __ioremap(offset, size, 0);
}
{
return __ioremap(offset, size, 0);
}