From patchwork Mon Mar 17 14:05:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26365 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE96F202FA for ; Mon, 17 Mar 2014 14:07:25 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf21115826iec.3 for ; Mon, 17 Mar 2014 07:07:25 -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=mN4eiTfzeA2ffvHRvUzEQXOcu6QI2mhFIZ74q/7jD4g=; b=Hgj/oA0fzdReAqxne/uKPoxSYRwjYbei96Rad7hOezX3gE7iV18H/WATc6TORY1hZI rtq1DReBvpl6VCrvEbUsm5VecMOwZw1y55n6OzDgoz5ApjTsNzZEz3n4evCSd7CGbTgz xwLZbLFgNRkgE8EJBahFfPxjT02ovygxfZEi9+xhUbZfUySYqub/6StvoAkQjkqe/vwR Ko56iYW2xf1/G5nuosb0ny6QPlpAKj2x9N+OnjpCC1L+VXLb27dnXwRhX0UM3g1Q3yjV WZOCNKCJFriGpbmWlDhuPlOfSje7pMV1S6TiILOd81TpWARDhS7qYGt6nv6+eViv5Rnu P0gw== X-Gm-Message-State: ALoCoQmrm37Y5yAGKypRnilQXyplrjnDoGOWJAn9uKZCxVSoumeWdB/VfMHCY9fjMaQt8rPzJsg+ X-Received: by 10.43.103.136 with SMTP id di8mr8067449icc.14.1395065245070; Mon, 17 Mar 2014 07:07:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.70 with SMTP id u64ls937125qgd.80.gmail; Mon, 17 Mar 2014 07:07:24 -0700 (PDT) X-Received: by 10.52.240.207 with SMTP id wc15mr17284806vdc.14.1395065244787; Mon, 17 Mar 2014 07:07:24 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id y6si4130817veb.25.2014.03.17.07.07.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:07:24 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 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.179; Received: by mail-vc0-f179.google.com with SMTP id ij19so5751729vcb.38 for ; Mon, 17 Mar 2014 07:07:24 -0700 (PDT) X-Received: by 10.220.106.84 with SMTP id w20mr20097781vco.18.1395065244706; Mon, 17 Mar 2014 07:07:24 -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 i9csp130027vck; Mon, 17 Mar 2014 07:07:24 -0700 (PDT) X-Received: by 10.140.40.138 with SMTP id x10mr3737099qgx.86.1395065244200; Mon, 17 Mar 2014 07:07:24 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id m6si3392362qay.27.2014.03.17.07.07.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:07:24 -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 1WPYBQ-0002FX-75; Mon, 17 Mar 2014 14:06:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPYBO-0002EA-N7 for xen-devel@lists.xenproject.org; Mon, 17 Mar 2014 14:06:27 +0000 Received: from [85.158.143.35:35918] by server-1.bemta-4.messagelabs.com id 84/02-09853-16107235; Mon, 17 Mar 2014 14:06:25 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1395065185!2639032!1 X-Originating-IP: [74.125.83.44] 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 11188 invoked from network); 17 Mar 2014 14:06:25 -0000 Received: from mail-ee0-f44.google.com (HELO mail-ee0-f44.google.com) (74.125.83.44) by server-16.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 17 Mar 2014 14:06:25 -0000 Received: by mail-ee0-f44.google.com with SMTP id e49so4172887eek.31 for ; Mon, 17 Mar 2014 07:06:25 -0700 (PDT) X-Received: by 10.14.1.68 with SMTP id 44mr24255617eec.0.1395065185085; Mon, 17 Mar 2014 07:06:25 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id x3sm39716538eep.17.2014.03.17.07.06.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 07:06:24 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 17 Mar 2014 14:05:57 +0000 Message-Id: <1395065165-15915-8-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395065165-15915-1-git-send-email-julien.grall@linaro.org> References: <1395065165-15915-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v2 07/15] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=n 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.179 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 Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- Changes in v2: - It doesn't compile when CONFIG_COMPAT=n, not y - Invert both operand of the && --- 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..9dd9081 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(CONFIG_COMPAT) && !defined(COMPAT) #undef _copy_to_guest #define _copy_to_guest copy_to_compat #undef _copy_from_guest