Merge tag 'dma-mapping-6.6-2023-08-29' of git://git.infradead.org/users/hch/dma-mapping

[platform/kernel/linux-rpi.git] / arch / x86 / xen / setup.c

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index e6c796a..b3e3796 100644 (file)
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -343,7 +343,7 @@ static void __init xen_do_set_identity_and_remap_chunk(
 
        WARN_ON(size == 0);
 
-       mfn_save = virt_to_mfn(buf);
+       mfn_save = virt_to_mfn((void *)buf);
 
        for (ident_pfn_iter = start_pfn, remap_pfn_iter = remap_pfn;
             ident_pfn_iter < ident_end_pfn;
@@ -506,7 +506,7 @@ void __init xen_remap_memory(void)
        unsigned long pfn_s = ~0UL;
        unsigned long len = 0;
 
-       mfn_save = virt_to_mfn(buf);
+       mfn_save = virt_to_mfn((void *)buf);
 
        while (xen_remap_mfn != INVALID_P2M_ENTRY) {
                /* Map the remap information */