From: Keir Fraser <keir@xensource.com>
Date: Wed, 24 Oct 2007 13:10:01 +0000 (+0100)
Subject: x86/64: Fix the build.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14842
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eab26d8a910f424a5f43eebf2d5e537015c7a0b4;p=xen.git

x86/64: Fix the build.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c
index 4d155b0a98..f596368e14 100644
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -298,15 +298,17 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op)
         struct vcpu *v;
         struct xenctl_cpumap ctlmap;
         cpumask_t cpumap;
+        XEN_GUEST_HANDLE(uint8_t) cpumap_bitmap;
         XEN_GUEST_HANDLE(uint64_t) idletimes;
 
         ret = -ENOSYS;
         if ( cpufreq_controller != FREQCTL_dom0_kernel )
             break;
 
-        memset(&ctlmap, 0, sizeof(ctlmap));
         ctlmap.nr_cpus  = op->u.getidletime.cpumap_nr_cpus;
-        ctlmap.bitmap.p = op->u.getidletime.cpumap_bitmap.p;
+        guest_from_compat_handle(cpumap_bitmap,
+                                 op->u.getidletime.cpumap_bitmap);
+        ctlmap.bitmap.p = cpumap_bitmap.p; /* handle -> handle_64 conversion */
         xenctl_cpumap_to_cpumask(&cpumap, &ctlmap);
         guest_from_compat_handle(idletimes, op->u.getidletime.idletime);