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-arm26
/
io.h
diff --git
a/include/asm-arm26/io.h
b/include/asm-arm26/io.h
index
bc20793
..
2aa033b
100644
(file)
--- a/
include/asm-arm26/io.h
+++ b/
include/asm-arm26/io.h
@@
-22,7
+22,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/types.h>
#include <asm/byteorder.h>
#include <asm/memory.h>
#include <linux/types.h>
#include <asm/byteorder.h>
#include <asm/memory.h>
@@
-420,5
+419,16
@@
extern void consistent_sync(void *vaddr, size_t size, int rw);
#define BIOVEC_MERGEABLE(vec1, vec2) \
((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
#define BIOVEC_MERGEABLE(vec1, vec2) \
((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
+/*
+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+ * access
+ */
+#define xlate_dev_mem_ptr(p) __va(p)
+
+/*
+ * Convert a virtual cached pointer to an uncached pointer
+ */
+#define xlate_dev_kmem_ptr(p) p
+
#endif /* __KERNEL__ */
#endif /* __ASM_ARM_IO_H */
#endif /* __KERNEL__ */
#endif /* __ASM_ARM_IO_H */