Subject: Re: [PATCH] xen: don't compile pv-specific parts if XEN_PV isn't
 configured
To: Tycho Andersen <tycho@docker.com>
Cc: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org,
        boris.ostrovsky@oracle.com, julien.grall@arm.com,
        Stefano Stabellini <sstabellini@kernel.org>
References: <20170914123858.1167-1-jgross@suse.com>
 <20170914163102.qv2unipggzgcjmon@docker>
From: Juergen Gross <jgross@suse.com>
Message-ID: <4f5fdb0d-c89f-e0d5-8232-a3a8b1c8b91d@suse.com>
Date: Fri, 15 Sep 2017 07:54:40 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.3.0
MIME-Version: 1.0
In-Reply-To: <20170914163102.qv2unipggzgcjmon@docker>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1869
Lines: 59

On 14/09/17 18:31, Tycho Andersen wrote:
> Hi Juergen,
> 
> On Thu, Sep 14, 2017 at 02:38:58PM +0200, Juergen Gross wrote:
>> xenbus_client.c contains some functions specific for pv guests.
>> Enclose them with #ifdef CONFIG_XEN_PV to avoid compiling them when
>> they are not needed (e.g. on ARM).
>>
>> Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Thanks for this! I think we also need to drop the old definition,
> something like the below. Can you fold this in or should I send it
> separately?

Please send it separately, as it touches ARM code only and thus should
be Acked by the ARM Xen maintainer.


Juergen

> 
> Cheers,
> 
> Tycho
> 
> From 410a0c15c354f1ba387bdac6837d0a2031744c56 Mon Sep 17 00:00:00 2001
> From: Tycho Andersen <tycho@docker.com>
> Date: Thu, 14 Sep 2017 08:57:30 -0700
> Subject: [PATCH] xen, arm64: drop dummy lookup_address()
> 
> This is unused, and conflicts with the definition that we'll add for XPFO.
> 
> Signed-off-by: Tycho Andersen <tycho@docker.com>
> ---
>  include/xen/arm/page.h | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/include/xen/arm/page.h b/include/xen/arm/page.h
> index 415dbc6e43fd..6adc2a955340 100644
> --- a/include/xen/arm/page.h
> +++ b/include/xen/arm/page.h
> @@ -84,16 +84,6 @@ static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)
>  	BUG();
>  }
>  
> -/* TODO: this shouldn't be here but it is because the frontend drivers
> - * are using it (its rolled in headers) even though we won't hit the code path.
> - * So for right now just punt with this.
> - */
> -static inline pte_t *lookup_address(unsigned long address, unsigned int *level)
> -{
> -	BUG();
> -	return NULL;
> -}
> -
>  extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
>  				   struct gnttab_map_grant_ref *kmap_ops,
>  				   struct page **pages, unsigned int count);
>