diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 06:40:47 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 06:40:47 -1000 |
| commit | 0a8abd97dcda50e5d2c893a51733416534e95706 (patch) | |
| tree | 394b79791f6d9f45d9ac8e16d3f97b7bb5eb29d4 /include | |
| parent | d6396a7331dbbe69c7e3fac2ab07b281ffe71fc8 (diff) | |
| parent | 0555ac4333d7da7cff83d5b06bd3679a3e1ef584 (diff) | |
| download | linux-0a8abd97dcda50e5d2c893a51733416534e95706.tar.bz2 | |
Merge tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"A fix for a missing __init annotation and two cleanup patches"
* tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen, arm64: drop dummy lookup_address()
xen: don't compile pv-specific parts if XEN_PV isn't configured
xen: x86: mark xen_find_pt_base as __init
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/arm/page.h | 10 |
1 files changed, 0 insertions, 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); |