WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Fix 64 bit build, cannot mix code and dat

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Fix 64 bit build, cannot mix code and data declarations.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 07 Sep 2007 09:13:51 -0700
Delivery-date: Fri, 07 Sep 2007 09:21:50 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
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 Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1188827915 -3600
# Node ID 1b11356af5488e19b387c65b196d7d44f7fbeb97
# Parent  3b50a7e52ff2f67de6cbd2cf03427b9bbac3ec5e
Fix 64 bit build, cannot mix code and data declarations.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 xen/arch/x86/platform_hypercall.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 3b50a7e52ff2 -r 1b11356af548 xen/arch/x86/platform_hypercall.c
--- a/xen/arch/x86/platform_hypercall.c Fri Aug 31 17:00:11 2007 +0100
+++ b/xen/arch/x86/platform_hypercall.c Mon Sep 03 14:58:35 2007 +0100
@@ -137,6 +137,9 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
     case XENPF_microcode_update:
     {
         extern int microcode_update(XEN_GUEST_HANDLE(void), unsigned long len);
+#ifdef COMPAT
+        XEN_GUEST_HANDLE(void) data;
+#endif
 
         ret = xsm_microcode();
         if ( ret )
@@ -146,8 +149,6 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
         ret = microcode_update(op->u.microcode.data,
                                op->u.microcode.length);
 #else
-        XEN_GUEST_HANDLE(void) data;
-
         guest_from_compat_handle(data, op->u.microcode.data);
         ret = microcode_update(data, op->u.microcode.length);
 #endif

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Fix 64 bit build, cannot mix code and data declarations., Xen patchbot-unstable <=