From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [RFC 07/14] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=y Date: Wed, 12 Mar 2014 16:16:02 +0000 Message-ID: <1394640969-25583-8-git-send-email-julien.grall@linaro.org> References: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNlpX-0007IB-Rw for xen-devel@lists.xenproject.org; Wed, 12 Mar 2014 16:16:32 +0000 Received: by mail-wi0-f174.google.com with SMTP id d1so2643390wiv.1 for ; Wed, 12 Mar 2014 09:16:30 -0700 (PDT) In-Reply-To: <1394640969-25583-1-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: xen-devel@lists.xenproject.org Cc: stefano.stabellini@citrix.com, Daniel De Graaf , Julien Grall , tim@xen.org, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org 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 --- 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 -- 1.7.10.4