From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel De Graaf Subject: Re: [RFC 07/14] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=y Date: Thu, 13 Mar 2014 10:26:44 -0400 Message-ID: <5321C024.1070703@tycho.nsa.gov> References: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> <1394640969-25583-8-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WO6bX-0004pY-5q for xen-devel@lists.xenproject.org; Thu, 13 Mar 2014 14:27:27 +0000 In-Reply-To: <1394640969-25583-8-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Julien Grall , xen-devel@lists.xenproject.org Cc: stefano.stabellini@citrix.com, tim@xen.org, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org 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 > > Signed-off-by: Julien Grall > Cc: Daniel De Graaf Acked-by: Daniel De Graaf > --- > 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