summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJulien Grall <julien.grall@linaro.org>2014-01-30 12:56:34 +0000
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2014-01-30 12:56:34 +0000
commit47c542050d306e50f09512eb6339dbf2fc02fddd (patch)
tree581ba02825b2cc2bdd36569d50ebfcaa3b83f4e8 /arch/arm
parente17b2f114cba5420fb28fa4bfead57d406a16533 (diff)
downloadop-kernel-dev-47c542050d306e50f09512eb6339dbf2fc02fddd.zip
op-kernel-dev-47c542050d306e50f09512eb6339dbf2fc02fddd.tar.gz
xen/gnttab: Use phys_addr_t to describe the grant frame base address
On ARM, address size can be 32 bits or 64 bits (if CONFIG_ARCH_PHYS_ADDR_T_64BIT is enabled). We can't assume that the grant frame base address will always fits in an unsigned long. Use phys_addr_t instead of unsigned long as argument for gnttab_setup_auto_xlat_frames. Signed-off-by: Julien Grall <julien.grall@linaro.org> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/xen/enlighten.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 3465f25..b96723e 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -234,7 +234,7 @@ static int __init xen_guest_init(void)
const char *version = NULL;
const char *xen_prefix = "xen,xen-";
struct resource res;
- unsigned long grant_frames;
+ phys_addr_t grant_frames;
node = of_find_compatible_node(NULL, NULL, "xen,xen");
if (!node) {
@@ -253,8 +253,8 @@ static int __init xen_guest_init(void)
return 0;
grant_frames = res.start;
xen_events_irq = irq_of_parse_and_map(node, 0);
- pr_info("Xen %s support found, events_irq=%d gnttab_frame_pfn=%lx\n",
- version, xen_events_irq, (grant_frames >> PAGE_SHIFT));
+ pr_info("Xen %s support found, events_irq=%d gnttab_frame=%pa\n",
+ version, xen_events_irq, &grant_frames);
if (xen_events_irq < 0)
return -ENODEV;
OpenPOWER on IntegriCloud