From: kaf24@localhost.localdomain <kaf24@localhost.localdomain>
Date: Sun, 13 Aug 2006 18:10:57 +0000 (+0100)
Subject: [XEN] Explicitly include domain_page.h for map_domain_page() and fix a
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15710^2~135
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce95c3ccfe2659d285e539c4041f781ae8810995;p=xen.git

[XEN] Explicitly include domain_page.h for map_domain_page() and fix a
warning about arithmetic on 'void *' pointers.
Based on a patch from Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 9a0f3434a7..32c20b0547 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -30,6 +30,7 @@
 #include <xen/mm.h>
 #include <xen/trace.h>
 #include <xen/guest_access.h>
+#include <xen/domain_page.h>
 #include <acm/acm_hooks.h>
 
 #define PIN_FAIL(_lbl, _rc, _f, _a...)          \
@@ -818,7 +819,7 @@ __gnttab_copy(
 {
     struct domain *sd = NULL, *dd = NULL;
     unsigned long s_frame, d_frame;
-    void *sp, *dp;
+    char *sp, *dp;
     s16 rc = GNTST_okay;
     int have_d_grant = 0, have_s_grant = 0;