ia64/xen-unstable

changeset 15829:1b11356af548

Fix 64 bit build, cannot mix code and data declarations.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Mon Sep 03 14:58:35 2007 +0100 (2007-09-03)
parents 3b50a7e52ff2
children e8b71d5e584d
files xen/arch/x86/platform_hypercall.c
line diff
     1.1 --- a/xen/arch/x86/platform_hypercall.c	Fri Aug 31 17:00:11 2007 +0100
     1.2 +++ b/xen/arch/x86/platform_hypercall.c	Mon Sep 03 14:58:35 2007 +0100
     1.3 @@ -137,6 +137,9 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
     1.4      case XENPF_microcode_update:
     1.5      {
     1.6          extern int microcode_update(XEN_GUEST_HANDLE(void), unsigned long len);
     1.7 +#ifdef COMPAT
     1.8 +        XEN_GUEST_HANDLE(void) data;
     1.9 +#endif
    1.10  
    1.11          ret = xsm_microcode();
    1.12          if ( ret )
    1.13 @@ -146,8 +149,6 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
    1.14          ret = microcode_update(op->u.microcode.data,
    1.15                                 op->u.microcode.length);
    1.16  #else
    1.17 -        XEN_GUEST_HANDLE(void) data;
    1.18 -
    1.19          guest_from_compat_handle(data, op->u.microcode.data);
    1.20          ret = microcode_update(data, op->u.microcode.length);
    1.21  #endif