xen-changelog

[Top] [All Lists]

[Xen-changelog] Converge ia64 grant_table API

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Converge ia64 grant_table API
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Thu, 15 Sep 2005 07:48:44 +0000
Delivery-date:	Thu, 15 Sep 2005 07:56:36 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Converge ia64 grant_table API, Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Merge latest xen-unstable into xen-ia64-unstable, Xen patchbot -unstable
Next by Date:	[Xen-changelog] Catchup with xen-unstable, add ia64 specifics to tools, and some VTI merge, Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Merge latest xen-unstable into xen-ia64-unstable, Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Catchup with xen-unstable, add ia64 specifics to tools, and some VTI merge, Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]