From patchwork Wed Mar 12 16:16:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26142 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E99F8203AB for ; Wed, 12 Mar 2014 16:17:40 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf2940183pab.5 for ; Wed, 12 Mar 2014 09:17:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=RdzrOXVD7MG9hXx9ZmZkOgWASmG2tbKYe6yf208xJos=; b=BAiMciAgjv2IoLAuN4lz/1A42j8dESVRBmOKru91FojyHv9vcft1/BH1XO5idsdeK3 emv0Qf4UxE/RdblFE9ujFzX9ndUChmxK3nLVoM69iU2d2LLsL1O6idgV7iRyoK2XScAP Q9U/XJxZB+7Hb1pQrXTngl+6pQo5CoJ3h3khqScPBvLa+cf9H1gEMtwSg7nkF73R0iKa gmusMsmmva6z2vxzUy97Fj7PcT4B12Jl86a1PjU219blxFfeWGWZQV78BS5V+7CCOcS2 iZkX9+A+qE1yceDUh5+WwL8eFKi8+EuwGpHA4xl/fk3BEcegW0Y8oR6jlqFA/ultqJ25 VPHQ== X-Gm-Message-State: ALoCoQnxnYZfutpj0rgfU7hmXMk0P6Jl8fiz6Ttc/fzpEVrSZwpHoZM6NaufTKmnaV3+kGFOzn5e X-Received: by 10.66.157.35 with SMTP id wj3mr2060353pab.11.1394641059901; Wed, 12 Mar 2014 09:17:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.43.119 with SMTP id d110ls2995762qga.32.gmail; Wed, 12 Mar 2014 09:17:39 -0700 (PDT) X-Received: by 10.52.113.1 with SMTP id iu1mr1036198vdb.35.1394641059709; Wed, 12 Mar 2014 09:17:39 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id f5si6966582vej.35.2014.03.12.09.17.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:17:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so790563vcb.15 for ; Wed, 12 Mar 2014 09:17:39 -0700 (PDT) X-Received: by 10.221.39.138 with SMTP id tm10mr33153940vcb.7.1394641059628; Wed, 12 Mar 2014 09:17:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp301303vck; Wed, 12 Mar 2014 09:17:39 -0700 (PDT) X-Received: by 10.50.128.164 with SMTP id np4mr30978997igb.34.1394641058319; Wed, 12 Mar 2014 09:17:38 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id l4si51167064ige.17.2014.03.12.09.17.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:17:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNlpZ-0007K5-VL; Wed, 12 Mar 2014 16:16:33 +0000 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: from [85.158.143.35:38038] by server-3.bemta-4.messagelabs.com id 21/7C-13602-F5880235; Wed, 12 Mar 2014 16:16:31 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1394640990!1618727!1 X-Originating-IP: [209.85.212.174] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3722 invoked from network); 12 Mar 2014 16:16:30 -0000 Received: from mail-wi0-f174.google.com (HELO mail-wi0-f174.google.com) (209.85.212.174) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Mar 2014 16:16:30 -0000 Received: by mail-wi0-f174.google.com with SMTP id d1so2643390wiv.1 for ; Wed, 12 Mar 2014 09:16:30 -0700 (PDT) X-Received: by 10.180.102.42 with SMTP id fl10mr8481319wib.42.1394640990420; Wed, 12 Mar 2014 09:16:30 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id dk9sm70840335wjb.4.2014.03.12.09.16.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Mar 2014 09:16:29 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 12 Mar 2014 16:16:02 +0000 Message-Id: <1394640969-25583-8-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> References: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Daniel De Graaf , Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [RFC 07/14] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=y X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: 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