| Message ID | 1393254590-9357-1-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Accepted |
| Commit | e7a797a8bf115e5b79f8fb5676379c3ac5c30255 |
| Headers | show
Return-Path: <patchwork-forward+bncBCI3N6FH3YJRBOWCVWMAKGQENUNBMZY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9296F2066C for <linaro@patches.linaro.org>; Mon, 24 Feb 2014 15:11:55 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf3504267pbb.7 for <linaro@patches.linaro.org>; Mon, 24 Feb 2014 07:11:54 -0800 (PST) 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: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=oq4mk9wBNPLYhDJh3plDDSk3ufpZqLdRTPB4rgq2Fjs=; b=PNSiwY6xc9Dm74nw+c90dhnT62mOe8QsgRgt1M/y4F1awihn6Pg1zCKzTXqh+iHe+r oQsLoCZU6zD+PstZ1EbKDeoKTHHxepm6pERzzlU1BAB/rYhWp8kfXpeLQQxJHPOsT12F OyWHlfdXdVdwPP7DiL2Pu9GpNNFIuEL6g+PZgU+LTyvGT749yCiYHY397XK6J7RJmTlh 6DX38B5VTnOY2Ub8/GZvuMmD0390dWPFADJVXTDqMPP0+/7r2XNmFNbbC71mF3ppVoA4 UG1YEUD5llmPTfAHEYhNkCgUO06rkXgTQ+Ae8fwS2CpOO78EWkO+d9QEhl5t3Lvu9ZPv 1bnA== X-Gm-Message-State: ALoCoQmYGW8WWwda0dk83tFNgldBw0u7YW2mHXS7jshvr/ZPQt5qlZFl/ljoMO3xVAZdid5zrJx9 X-Received: by 10.66.146.65 with SMTP id ta1mr11677033pab.19.1393254714782; Mon, 24 Feb 2014 07:11:54 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.200 with SMTP id k66ls176626qge.85.gmail; Mon, 24 Feb 2014 07:11:54 -0800 (PST) X-Received: by 10.221.31.71 with SMTP id sf7mr33086vcb.69.1393254714598; Mon, 24 Feb 2014 07:11:54 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id o6si5914277vcn.21.2014.02.24.07.11.54 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 07:11:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.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.128.179; Received: by mail-ve0-f179.google.com with SMTP id oz11so548812veb.24 for <patchwork-forward@linaro.org>; Mon, 24 Feb 2014 07:11:54 -0800 (PST) X-Received: by 10.220.98.204 with SMTP id r12mr708799vcn.48.1393254714526; Mon, 24 Feb 2014 07:11:54 -0800 (PST) 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.174.196 with SMTP id u4csp68064vcz; Mon, 24 Feb 2014 07:11:54 -0800 (PST) X-Received: by 10.220.133.80 with SMTP id e16mr12904738vct.13.1393254714211; Mon, 24 Feb 2014 07:11:54 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id y3si5884430vdo.110.2014.02.24.07.11.53 for <multiple recipients> (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 24 Feb 2014 07:11:54 -0800 (PST) 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 <xen-devel-bounces@lists.xen.org>) id 1WHxAS-000070-8J; Mon, 24 Feb 2014 15:10:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from <julien.grall@linaro.org>) id 1WHxAP-00006n-DQ for xen-devel@lists.xenproject.org; Mon, 24 Feb 2014 15:10:01 +0000 Received: from [193.109.254.147:7420] by server-4.bemta-14.messagelabs.com id 5C/0D-32066-8C06B035; Mon, 24 Feb 2014 15:10:00 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1393254599!6427189!1 X-Originating-IP: [209.85.215.170] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22873 invoked from network); 24 Feb 2014 15:09:59 -0000 Received: from mail-ea0-f170.google.com (HELO mail-ea0-f170.google.com) (209.85.215.170) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 24 Feb 2014 15:09:59 -0000 Received: by mail-ea0-f170.google.com with SMTP id g15so3148288eak.15 for <xen-devel@lists.xenproject.org>; Mon, 24 Feb 2014 07:09:59 -0800 (PST) X-Received: by 10.15.23.194 with SMTP id h42mr24910937eeu.32.1393254598965; Mon, 24 Feb 2014 07:09:58 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id f45sm64716451eeg.5.2014.02.24.07.09.57 for <multiple recipients> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Feb 2014 07:09:58 -0800 (PST) From: Julien Grall <julien.grall@linaro.org> To: xen-devel@lists.xenproject.org Date: Mon, 24 Feb 2014 15:09:50 +0000 Message-Id: <1393254590-9357-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 Cc: Julien Grall <julien.grall@linaro.org>, Daniel De Graaf <dgdegra@tycho.nsa.gov> Subject: [Xen-devel] [PATCH] xen/xsm: Fix xsm_map_gfmn_foreign prototype when XSM is enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=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.128.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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 1939453..5d35455 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -621,7 +621,7 @@ static inline int xsm_ioport_mapping (xsm_default_t def, struct domain *d, uint3 #endif /* CONFIG_X86 */ #ifdef CONFIG_ARM -static inline int xsm_map_gmfn_foreign (struct domain *d, struct domain *t) +static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, struct domain *t) { return xsm_ops->map_gmfn_foreign(d, t); }
Signed-off-by: Julien Grall <julien.grall@linaro.org> Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> --- xen/include/xsm/xsm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)