From mboxrd@z Thu Jan  1 00:00:00 1970
From: Keir Fraser <keir@xen.org>
Subject: Re: [PATCH] xsm_remove_from_physmap is (so far) only
 defined for X86 architecture, not for ARM
Date: Fri, 11 Jan 2013 13:47:24 +0000
Message-ID: <CD15C86C.583A7%keir@xen.org>
References: <1357911131-9397-1-git-send-email-lra@sics.se>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1357911131-9397-1-git-send-email-lra@sics.se>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: lra@sics.se, xen-devel@lists.xen.org
Cc: Lars Rasmusson <Lars.Rasmusson@sics.se>
List-Id: xen-devel@lists.xenproject.org

On 11/01/2013 13:32, "lra@sics.se" <lra@sics.se> wrote:

> From: Lars Rasmusson <Lars.Rasmusson@sics.se>
> 
> Signed-off-by: Lars Rasmusson <Lars.Rasmusson@sics.se>

If this is a build fix after my checkins this morning then:
Acked-by: Keir Fraser <keir@xen.org>

> ---
>  xen/common/memory.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/common/memory.c b/xen/common/memory.c
> index c8c1ef2..8230565 100644
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -676,12 +676,13 @@ long do_memory_op(unsigned long cmd,
> XEN_GUEST_HANDLE_PARAM(void) arg)
>          if ( rc != 0 )
>              return rc;
>  
> +#ifdef CONFIG_X86
>          if ( xsm_remove_from_physmap(current->domain, d) )
>          {
>              rcu_unlock_domain(d);
>              return -EPERM;
>          }
> -
> +#endif
>          domain_lock(d);
>  
>          page = get_page_from_gfn(d, xrfp.gpfn, NULL, P2M_ALLOC);