From 10d0685a9e64b81c8d4434c8d9932f31870b9be2 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 10 Mar 2026 12:20:00 -0400 Subject: [PATCH] EFI: Fix some more instances of memcpy on other architectures. --- src/system/boot/platform/efi/arch/arm/arch_start.cpp | 2 +- src/system/boot/platform/efi/arch/riscv64/arch_start.cpp | 2 +- src/system/boot/platform/efi/arch/x86/arch_start.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/system/boot/platform/efi/arch/arm/arch_start.cpp b/src/system/boot/platform/efi/arch/arm/arch_start.cpp index 98fed4287d..165d1562b9 100644 --- a/src/system/boot/platform/efi/arch/arm/arch_start.cpp +++ b/src/system/boot/platform/efi/arch/arm/arch_start.cpp @@ -205,7 +205,7 @@ arch_start_kernel(addr_t kernelEntry) // Copy final kernel args // This should be the last step before jumping to the kernel // as there are some fixups happening to kernel_args even in the last minute - memcpy(kernelArgs, &gKernelArgs, sizeof(struct kernel_args)); + memcpy((void *)kernelArgs, &gKernelArgs, sizeof(struct kernel_args)); //smp_boot_other_cpus(final_ttbr0, kernelEntry, (addr_t)&gKernelArgs); diff --git a/src/system/boot/platform/efi/arch/riscv64/arch_start.cpp b/src/system/boot/platform/efi/arch/riscv64/arch_start.cpp index ab2289ddcc..9d74e2876e 100644 --- a/src/system/boot/platform/efi/arch/riscv64/arch_start.cpp +++ b/src/system/boot/platform/efi/arch/riscv64/arch_start.cpp @@ -150,7 +150,7 @@ arch_start_kernel(addr_t kernelEntry) // Copy final kernel args // This should be the last step before jumping to the kernel // as there are some fixups happening to kernel_args even in the last minute - memcpy(kernelArgs, &gKernelArgs, sizeof(struct kernel_args)); + memcpy((void *)kernelArgs, &gKernelArgs, sizeof(struct kernel_args)); smp_boot_other_cpus(satp, kernelEntry, virtKernelArgs); diff --git a/src/system/boot/platform/efi/arch/x86/arch_start.cpp b/src/system/boot/platform/efi/arch/x86/arch_start.cpp index 164dc61718..9a3962e436 100644 --- a/src/system/boot/platform/efi/arch/x86/arch_start.cpp +++ b/src/system/boot/platform/efi/arch/x86/arch_start.cpp @@ -160,7 +160,7 @@ arch_start_kernel(addr_t kernelEntry) // Copy final kernel args // This should be the last step before jumping to the kernel // as there are some fixups happening to kernel_args even in the last minute - memcpy(kernelArgs, &gKernelArgs, sizeof(struct kernel_args)); + memcpy((void *)kernelArgs, &gKernelArgs, sizeof(struct kernel_args)); smp_boot_other_cpus(pageDirectory, kernelEntry, virtKernelArgs);