Message ID | 20170918223532.20616-1-tycho@docker.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On 18/09/17 23:35, Tycho Andersen wrote: > This is unused, and conflicts with the definition that we'll add for XPFO. > > Signed-off-by: Tycho Andersen <tycho@docker.com> > CC: Boris Ostrovsky <boris.ostrovsky@oracle.com> > CC: Juergen Gross <jgross@suse.com> > CC: Stefano Stabellini <sstabellini@kernel.org> Reviewed-by: Julien Grall <julien.grall@arm.com> Cheers, > --- > The patch this depends on is in for-linus-4.14b, so it would be easiest to > carry this one too; Stefano can you ack it and Boris can you carry it? > > Thanks! > --- > 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); >
On 09/18/2017 06:35 PM, Tycho Andersen wrote: > This is unused, and conflicts with the definition that we'll add for XPFO. > > Signed-off-by: Tycho Andersen <tycho@docker.com> > CC: Boris Ostrovsky <boris.ostrovsky@oracle.com> > CC: Juergen Gross <jgross@suse.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > --- > The patch this depends on is in for-linus-4.14b, so it would be easiest to > carry this one too; Stefano can you ack it and Boris can you carry it? Applied to for-linus-14b. -boris
On Tue, 19 Sep 2017, Boris Ostrovsky wrote: > On 09/18/2017 06:35 PM, Tycho Andersen wrote: > > This is unused, and conflicts with the definition that we'll add for XPFO. > > > > Signed-off-by: Tycho Andersen <tycho@docker.com> > > CC: Boris Ostrovsky <boris.ostrovsky@oracle.com> > > CC: Juergen Gross <jgross@suse.com> > > CC: Stefano Stabellini <sstabellini@kernel.org> > > --- > > The patch this depends on is in for-linus-4.14b, so it would be easiest to > > carry this one too; Stefano can you ack it and Boris can you carry it? Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > Applied to for-linus-14b.
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);
This is unused, and conflicts with the definition that we'll add for XPFO. Signed-off-by: Tycho Andersen <tycho@docker.com> CC: Boris Ostrovsky <boris.ostrovsky@oracle.com> CC: Juergen Gross <jgross@suse.com> CC: Stefano Stabellini <sstabellini@kernel.org> --- The patch this depends on is in for-linus-4.14b, so it would be easiest to carry this one too; Stefano can you ack it and Boris can you carry it? Thanks! --- include/xen/arm/page.h | 10 ---------- 1 file changed, 10 deletions(-)