diff options
| author | Stefano Stabellini <stefanos@xilinx.com> | 2018-10-31 16:11:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-21 09:19:28 +0100 |
| commit | 491636a88c1182000cf710e01cbee88d5d658b46 (patch) | |
| tree | b7d9038e16b1e4d06746300ef7708c5dae2c8b0d /include/xen | |
| parent | 32bd1336061df0b420d295fe2d0b6b4e9f19a307 (diff) | |
| download | linux-stable-491636a88c1182000cf710e01cbee88d5d658b46.tar.gz linux-stable-491636a88c1182000cf710e01cbee88d5d658b46.tar.bz2 linux-stable-491636a88c1182000cf710e01cbee88d5d658b46.zip | |
CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM
commit f9005571701920551bcf54a500973fb61f2e1eda upstream.
xen_create_contiguous_region has now only an implementation if
CONFIG_XEN_PV is defined. However, on ARM we never set CONFIG_XEN_PV but
we do have an implementation of xen_create_contiguous_region which is
required for swiotlb-xen to work correctly (although it just sets
*dma_handle).
[backport: remove change to xen_remap_pfn]
Cc: <stable@vger.kernel.org> # 4.12
Fixes: 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds")
Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
CC: Jeff.Kubascik@dornerworks.com
CC: Jarvis.Roach@dornerworks.com
CC: Nathan.Studer@dornerworks.com
CC: vkuznets@redhat.com
CC: boris.ostrovsky@oracle.com
CC: jgross@suse.com
CC: julien.grall@arm.com
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/xen')
| -rw-r--r-- | include/xen/xen-ops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index fd18c974a619..f6e798d42069 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -41,7 +41,7 @@ int xen_setup_shutdown_event(void); extern unsigned long *xen_contiguous_bitmap; -#ifdef CONFIG_XEN_PV +#if defined(CONFIG_XEN_PV) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, unsigned int address_bits, dma_addr_t *dma_handle); |