@@ -209,8 +209,7 @@ void __init apply_alternatives_all(void)
* The text and inittext section are read-only. So re-map Xen to
* be able to patch the code.
*/
- xenmap = __vmap(&xen_mfn, 1U << xen_order, 1, 1, PAGE_HYPERVISOR,
- VMAP_DEFAULT);
+ xenmap = vmap_contig(xen_mfn, 1U << xen_order);
/* Re-mapping Xen is not expected to fail during boot. */
BUG_ON(!xenmap);
@@ -61,9 +61,8 @@ static bool copy_hyp_vect_bpi(unsigned int slot, const char *hyp_vec_start,
* Vectors are part of the text that are mapped read-only. So re-map
* the vector table to be able to update vectors.
*/
- dst_remapped = __vmap(&dst_mfn,
- 1UL << get_order_from_bytes(VECTOR_TABLE_SIZE),
- 1, 1, PAGE_HYPERVISOR, VMAP_DEFAULT);
+ dst_remapped = vmap_contig(dst_mfn,
+ 1UL << get_order_from_bytes(VECTOR_TABLE_SIZE));
if ( !dst_remapped )
return false;
@@ -211,7 +211,7 @@ static __init int kernel_decompress(struct bootmodule *mod, uint32_t offset)
return -ENOMEM;
}
mfn = page_to_mfn(pages);
- output = __vmap(&mfn, 1 << kernel_order_out, 1, 1, PAGE_HYPERVISOR, VMAP_DEFAULT);
+ output = vmap_contig(mfn, 1 << kernel_order_out);
rc = perform_gunzip(output, input, size);
clean_dcache_va_range(output, output_size);
@@ -39,8 +39,7 @@ int arch_livepatch_quiesce(void)
* The text section is read-only. So re-map Xen to be able to patch
* the code.
*/
- vmap_of_xen_text = __vmap(&text_mfn, 1U << text_order, 1, 1, PAGE_HYPERVISOR,
- VMAP_DEFAULT);
+ vmap_of_xen_text = vmap_contig(text_mfn, 1U << text_order);
if ( !vmap_of_xen_text )
{
Currently the arm code uses __vmap function in few parts to map physically contiguous pages, vmap_contig was introduced recently and does the same because it's a wrapper for __vmap, so use the latter instead of the direct __vmap function. Signed-off-by: Luca Fancellu <luca.fancellu@arm.com> --- xen/arch/arm/alternative.c | 3 +-- xen/arch/arm/cpuerrata.c | 5 ++--- xen/arch/arm/kernel.c | 2 +- xen/arch/arm/livepatch.c | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-)