Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells...

[cascardo/linux.git] / drivers / xen / grant-table.c

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 157c0cc..04c1b2d 100644 (file)
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1147,7 +1147,7 @@ static int gnttab_setup(void)
                return gnttab_map(0, nr_grant_frames - 1);
 
        if (gnttab_shared.addr == NULL) {
-               gnttab_shared.addr = ioremap(xen_hvm_resume_frames,
+               gnttab_shared.addr = xen_remap(xen_hvm_resume_frames,
                                                PAGE_SIZE * max_nr_gframes);
                if (gnttab_shared.addr == NULL) {
                        printk(KERN_WARNING