ioremap_cache

Conflicts:
	drivers/tty/hvc/hvc_xen.c

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 6b8f97c3918dd3256610db719f5722e7bed5c3ea..3859436d726f6a2aeab00779888474b06b3d0bae 100644 (file)
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -39,6 +39,7 @@
 #include <xen/interface/sched.h>
 #include <xen/hvc-console.h>
 #include <xen/xenbus.h>
+#include <asm/mach/map.h>
 
 #include "hvc_console.h"
 
@@ -229,7 +230,7 @@ static int xen_hvm_console_init(void)
                return -ENODEV;
        }
        mfn = v;
-       info->intf = ioremap(mfn << PAGE_SHIFT, PAGE_SIZE);
+       info->intf = __arm_ioremap(mfn << PAGE_SHIFT, PAGE_SIZE, MT_MEMORY);
        if (info->intf == NULL) {
                kfree(info);
                return -ENODEV;

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 56494b2918b24a0ac2bc8d56346a8f801020b176..931648b9ca95ff62a3c7cfab21effabbd7a35170 100644 (file)
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -47,6 +47,8 @@
 #include <xen/hvc-console.h>
 #include <asm/xen/hypercall.h>
 #include <asm/xen/interface.h>
+#include <asm/io.h>
+#include <asm/mach/map.h>
 
 #include <asm/pgtable.h>
 #include <asm/sync_bitops.h>
@@ -987,8 +989,8 @@ int gnttab_resume(void)
                return gnttab_map(0, nr_grant_frames - 1);
 
        if (gnttab_shared.addr == NULL) {
-               gnttab_shared.addr = ioremap(xen_hvm_resume_frames,
-                                               PAGE_SIZE * max_nr_gframes);
+               gnttab_shared.addr = __arm_ioremap(xen_hvm_resume_frames,
+                                               PAGE_SIZE * max_nr_gframes, MT_MEMORY);
                if (gnttab_shared.addr == NULL) {
                        printk(KERN_WARNING
                                        "Failed to ioremap gnttab share frames!");

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index c25772ce571e8ec00da96ee45df2c042b11466be..3ab35b9fb3d76267f28a5479a5501e1e367711e0 100644 (file)
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -51,6 +51,8 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/xen/hypervisor.h>
+#include <asm/io.h>
+#include <asm/mach/map.h>
 
 #include <xen/xen.h>
 #include <xen/xenbus.h>
@@ -769,7 +771,8 @@ static int __init xenbus_init(void)
                        goto out_error;
                xen_store_mfn = (unsigned long)v;
                xen_store_interface =
-                       ioremap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE);
+                       __arm_ioremap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE, MT_MEMORY);
+               printk("DEBUG %s %d mfn=%lx virt=%lx evtchn=%lu content=%lx\n",__func__,__LINE__,(unsigned long)xen_store_mfn,(unsigned long)xen_store_interface,(unsigned long)xen_store_evtchn,*((unsigned long*)xen_store_interface));
                break;
        default:
                pr_warn("Xenstore state unknown\n");