diff options
| author | Rob Herring <robh@kernel.org> | 2018-12-13 18:20:36 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-12-13 18:20:36 +0100 |
| commit | acc2038738bd6f881e7a277ba14fa7c589fd3058 (patch) | |
| tree | fd56524867a9b726b3e5d2cb040ff16b2f2a67a0 /include/xen/xen-ops.h | |
| parent | dt-bindings: arm: mrvl: amend Browstone compatible string (diff) | |
| parent | dt-bindings: Convert trivial-devices.txt to json-schema (diff) | |
| download | linux-acc2038738bd6f881e7a277ba14fa7c589fd3058.tar.xz linux-acc2038738bd6f881e7a277ba14fa7c589fd3058.zip | |
Merge branch 'yaml-bindings-for-v4.21' into dt/next
Diffstat (limited to 'include/xen/xen-ops.h')
| -rw-r--r-- | include/xen/xen-ops.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 18803ff76e27..4969817124a8 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -42,16 +42,12 @@ 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); void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order); - -int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr, - xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot, - unsigned int domid, bool no_translate, struct page **pages); #else static inline int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, @@ -63,7 +59,13 @@ static inline int xen_create_contiguous_region(phys_addr_t pstart, static inline void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order) { } +#endif +#if defined(CONFIG_XEN_PV) +int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr, + xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot, + unsigned int domid, bool no_translate, struct page **pages); +#else static inline int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot, unsigned int domid, |