summaryrefslogtreecommitdiffstats
path: root/include/xen
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-10-17 09:39:14 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-10-19 15:17:55 -0400
commitef32f89298c094b6ed76c0c4981b7a51e939cb71 (patch)
tree944cee088fd708167500c6c4a7ed4d87cad3f026 /include/xen
parentbf86ad8095d4684ada0d37bb1355ede2c88a5e4e (diff)
downloadlinux-stable-ef32f89298c094b6ed76c0c4981b7a51e939cb71.tar.gz
linux-stable-ef32f89298c094b6ed76c0c4981b7a51e939cb71.tar.bz2
linux-stable-ef32f89298c094b6ed76c0c4981b7a51e939cb71.zip
xen: grant: use xen_pfn_t type for frame_list.
This correctly sizes it as 64 bit on ARM but leaves it as unsigned long on x86 (therefore no intended change on x86). The long and ulong guest handles are now unused (and a bit dangerous) so remove them. Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'include/xen')
-rw-r--r--include/xen/grant_table.h2
-rw-r--r--include/xen/interface/grant_table.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index ba0d77529a29..962b7df5eabf 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -170,7 +170,7 @@ gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr,
unmap->dev_bus_addr = 0;
}
-int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
+int arch_gnttab_map_shared(xen_pfn_t *frames, unsigned long nr_gframes,
unsigned long max_nr_gframes,
void **__shared);
int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index f9f8b975ae74..e40fae9bf11a 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -310,7 +310,7 @@ struct gnttab_setup_table {
uint32_t nr_frames;
/* OUT parameters. */
int16_t status; /* GNTST_* */
- GUEST_HANDLE(ulong) frame_list;
+ GUEST_HANDLE(xen_pfn_t) frame_list;
};
DEFINE_GUEST_HANDLE_STRUCT(gnttab_setup_table);