[Xen-changelog] Converge ia64 grant_table API

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 6dadf4d93ee31ec2c6470176d4d617f132f1b7f9
# Parent  2c823d27cf3392d986d16f57c7431a7f65dd856f
Converge ia64 grant_table API

diff -r 2c823d27cf33 -r 6dadf4d93ee3 
linux-2.6-xen-sparse/include/asm-xen/gnttab.h
--- a/linux-2.6-xen-sparse/include/asm-xen/gnttab.h     Tue Sep 13 19:42:33 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/gnttab.h     Tue Sep 13 20:20:02 2005
@@ -18,7 +18,11 @@
 #include <asm-xen/xen-public/grant_table.h>
 
 /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
+#ifdef __ia64__
+#define NR_GRANT_FRAMES 1
+#else
 #define NR_GRANT_FRAMES 4
+#endif
 
 struct gnttab_free_callback {
     struct gnttab_free_callback *next;
@@ -63,4 +67,10 @@
 void gnttab_grant_foreign_transfer_ref(grant_ref_t, domid_t domid,
                                       unsigned long pfn);
 
+#ifdef __ia64__
+#define gnttab_map_vaddr(map) __va(map.dev_bus_addr)
+#else
+#define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
+#endif
+
 #endif /* __ASM_GNTTAB_H__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog