Re: [RFC 07/14] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=y

[Daniel De Graaf <dgdegra@tycho.nsa.gov>]

On 03/12/2014 12:16 PM, Julien Grall wrote:
> The commit f7d29f7b "flask: add compat mode guest support" introduces
> build breakage on ARM when XSM is enabled. It's because ARM doesn't use
> compat mode.
>
> flask_op.c:794:34: fatal error: compat/event_channel.h: No such file or directory
>   #include <compat/event_channel.h>
>
> Signed-off-by: Julien Grall <julien.grall@linaro.org>
> Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>

Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>

> ---
>   xen/xsm/flask/flask_op.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c
> index 3b84679..3eb3a01 100644
> --- a/xen/xsm/flask/flask_op.c
> +++ b/xen/xsm/flask/flask_op.c
> @@ -785,7 +785,7 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op)
>       return rv;
>   }
>
> -#ifndef COMPAT
> +#if !defined(COMPAT) && defined(CONFIG_COMPAT)
>   #undef _copy_to_guest
>   #define _copy_to_guest copy_to_compat
>   #undef _copy_from_guest
>


-- 
Daniel De Graaf
National Security Agency