patch ioremap_cache

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 7038de53652b3cd8999ac7d642fd84441c79dcd5..c3d51482c0da62ba262aaf7103fad7e3e269f51d 100644 (file)
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -49,6 +49,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>
@@ -1146,8 +1148,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 038b71dbf03c980fd9024284f2e5cca1bfb3db95..1011d3467b4e76e6aee851925071792ceaa2a66b 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");