2 files changed, 4 insertions(+), 14 deletions(-)
arch/ia64/mm/ioremap.c | 2 ++
include/asm-ia64/io.h | 16 ++--------------
# HG changeset patch
# User agriffis@xxxxxxxxxxxxxxx
# Node ID 575b49ce64a2098515c48a3f29a214f853025fcf
# Parent 489de0be169cc96a41105f8cb9046be740a9a706
Port xen ioremap mods forward to 2.6.18-rc2
Signed-off-by: Aron Griffis <aron@xxxxxx>
diff -r 489de0be169c -r 575b49ce64a2 arch/ia64/mm/ioremap.c
--- a/arch/ia64/mm/ioremap.c Thu Jul 27 00:09:52 2006 -0400
+++ b/arch/ia64/mm/ioremap.c Thu Jul 27 00:09:55 2006 -0400
@@ -16,7 +16,9 @@ static inline void __iomem *
static inline void __iomem *
__ioremap (unsigned long offset, unsigned long size)
{
+#ifdef CONFIG_XEN
offset = HYPERVISOR_ioremap(offset, size);
+#endif
return (void __iomem *) (__IA64_UNCACHED_OFFSET | offset);
}
diff -r 489de0be169c -r 575b49ce64a2 include/asm-ia64/io.h
--- a/include/asm-ia64/io.h Thu Jul 27 00:09:52 2006 -0400
+++ b/include/asm-ia64/io.h Thu Jul 27 00:09:55 2006 -0400
@@ -451,25 +451,13 @@ __writeq (unsigned long val, volatile vo
# define outl_p outl
#endif
-/*
- * An "address" in IO memory space is not clearly either an integer or a
pointer. We will
- * accept both, thus the casts.
- *
- * On ia-64, we access the physical I/O memory space through the uncached
kernel region.
- */
-static inline void __iomem *
-ioremap (unsigned long offset, unsigned long size)
-{
- offset = HYPERVISOR_ioremap(offset, size);
- return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset));
-}
+extern void __iomem * ioremap(unsigned long offset, unsigned long size);
+extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long
size);
static inline void
iounmap (volatile void __iomem *addr)
{
}
-
-#define ioremap_nocache(o,s) ioremap(o,s)
/* Use normal IO mappings for DMI */
#define dmi_ioremap ioremap
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
|
Home