Fixes for backport.
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index 499137d..7e51902 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -9,7 +9,7 @@
hostprogs := gen-hyprel
HOST_EXTRACFLAGS += -I$(objtree)/include
-lib-objs := clear_page.o copy_page.o memcpy.o memset.o
+lib-objs := clear_page.o copy_page.o memcpy.o memmove.o memset.o
lib-objs := $(addprefix ../../../lib/, $(lib-objs))
obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \
diff --git a/arch/arm64/kvm/hyp/nvhe/ffa_handler.c b/arch/arm64/kvm/hyp/nvhe/ffa_handler.c
index a9e788d..a2f5e08 100644
--- a/arch/arm64/kvm/hyp/nvhe/ffa_handler.c
+++ b/arch/arm64/kvm/hyp/nvhe/ffa_handler.c
@@ -18,7 +18,7 @@
#include <nvhe/mm.h>
#include <nvhe/spinlock.h>
#include <nvhe/trap_handler.h>
-#include <linux/align.h>
+#include <stdalign.h>
// TODO: Initialise this properly
u64 __ro_after_init smccc_has_sve_hint;
diff --git a/arch/arm64/kvm/hyp/nvhe/ffa_memory.c b/arch/arm64/kvm/hyp/nvhe/ffa_memory.c
index afeaebb..ddff8c7 100644
--- a/arch/arm64/kvm/hyp/nvhe/ffa_memory.c
+++ b/arch/arm64/kvm/hyp/nvhe/ffa_memory.c
@@ -6,7 +6,6 @@
#include <asm/kvm_hyp.h>
#include <asm/kvm_pgtable.h>
-#include <linux/align.h>
#include <linux/arm-smccc.h>
#include <linux/arm_ffa.h>
#include <linux/kvm_types.h>
@@ -16,6 +15,7 @@
#include <nvhe/mem_protect.h>
#include <nvhe/mm.h>
#include <nvhe/spinlock.h>
+#include <stdalign.h>
/* The maximum number of recipients a memory region may be sent to. */
#define MAX_MEM_SHARE_RECIPIENTS 1
diff --git a/arch/arm64/kvm/hyp/nvhe/printk.c b/arch/arm64/kvm/hyp/nvhe/printk.c
index db35d89..8cd811e 100644
--- a/arch/arm64/kvm/hyp/nvhe/printk.c
+++ b/arch/arm64/kvm/hyp/nvhe/printk.c
@@ -7,12 +7,12 @@
#include <linux/kernel.h>
#include <linux/kern_levels.h>
#include <linux/printk.h>
-#include <linux/stdarg.h>
+#include <stdarg.h>
#include <../debug-pl011.h>
#define LOG_LINE_MAX 1024
-int _printk(const char *fmt, ...)
+int printk(const char *fmt, ...)
{
va_list args;
int r;
diff --git a/arch/arm64/kvm/hyp/nvhe/vsprintf.c b/arch/arm64/kvm/hyp/nvhe/vsprintf.c
index c99d753..0c526a7 100644
--- a/arch/arm64/kvm/hyp/nvhe/vsprintf.c
+++ b/arch/arm64/kvm/hyp/nvhe/vsprintf.c
@@ -9,7 +9,7 @@
#include <linux/ctype.h>
#include <linux/err.h>
#include <linux/kernel.h>
-#include <linux/stdarg.h>
+#include <stdarg.h>
#include <linux/stddef.h>
#include <linux/string.h>
diff --git a/lib/test_ffa.c b/lib/test_ffa.c
index f998bff..918930ab 100644
--- a/lib/test_ffa.c
+++ b/lib/test_ffa.c
@@ -8,10 +8,10 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/align.h>
#include <linux/arm_ffa.h>
#include <linux/arm-smccc.h>
#include <linux/kvm_types.h>
+#include <stdalign.h>
#include "../tools/testing/selftests/kselftest_module.h"
/** FF-A version 1.0. */
