git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-s390
/
io.h
diff --git
a/include/asm-s390/io.h
b/include/asm-s390/io.h
index
d4614b3
..
efb7de9
100644
(file)
--- a/
include/asm-s390/io.h
+++ b/
include/asm-s390/io.h
@@
-27,18
+27,16
@@
static inline unsigned long virt_to_phys(volatile void * address)
{
unsigned long real_address;
static inline unsigned long virt_to_phys(volatile void * address)
{
unsigned long real_address;
-
__asm__
(
+
asm volatile
(
#ifndef __s390x__
#ifndef __s390x__
- " lra %0,0(%1)\n"
- " jz 0f\n"
- " sr %0,%0\n"
+ " lra %0,0(%1)\n"
#else /* __s390x__ */
#else /* __s390x__ */
- " lrag %0,0(%1)\n"
- " jz 0f\n"
- " slgr %0,%0\n"
+ " lrag %0,0(%1)\n"
#endif /* __s390x__ */
#endif /* __s390x__ */
+ " jz 0f\n"
+ " la %0,0\n"
"0:"
"0:"
-
: "=a" (real_address) : "a" (address) : "cc"
);
+
: "=a" (real_address) : "a" (address) : "cc"
);
return real_address;
}
return real_address;
}
@@
-47,11
+45,6
@@
static inline void * phys_to_virt(unsigned long address)
return __io_virt(address);
}
return __io_virt(address);
}
-/*
- * Change "struct page" to physical address.
- */
-#define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT)
-
extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
static inline void * ioremap (unsigned long offset, unsigned long size)
extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
static inline void * ioremap (unsigned long offset, unsigned long size)
@@
-116,7
+109,7
@@
extern void iounmap(void *addr);
#define outb(x,addr) ((void) writeb(x,addr))
#define outb_p(x,addr) outb(x,addr)
#define outb(x,addr) ((void) writeb(x,addr))
#define outb_p(x,addr) outb(x,addr)
-#define mmiowb()
+#define mmiowb()
do { } while (0)
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem