summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorTiwei Bie <tiwei.btw@antgroup.com>2024-04-23 20:58:55 +0800
committerRichard Weinberger <richard@nod.at>2024-04-30 14:15:42 +0200
commit6a85e34c4d07d2ec0c153067baff338ac0db55ca (patch)
treedba37ce9e4b069f2cfb27ffea3cc59d7b4dee2e6 /arch/um
parent3144013e48f4f6e5127223c4ebc488016815dedb (diff)
downloadlinux-stable-6a85e34c4d07d2ec0c153067baff338ac0db55ca.tar.gz
linux-stable-6a85e34c4d07d2ec0c153067baff338ac0db55ca.tar.bz2
linux-stable-6a85e34c4d07d2ec0c153067baff338ac0db55ca.zip
um: Fix the declaration of kasan_map_memory
Make it match its definition (size_t vs unsigned long). And declare it in a shared header to fix the -Wmissing-prototypes warning, as it is defined in the user code and called in the kernel code. Fixes: 5b301409e8bc ("UML: add support for KASAN under x86_64") Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/asm/kasan.h1
-rw-r--r--arch/um/include/shared/kern_util.h2
-rw-r--r--arch/um/os-Linux/mem.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/include/asm/kasan.h b/arch/um/include/asm/kasan.h
index 0d6547f4ec85..f97bb1f7b851 100644
--- a/arch/um/include/asm/kasan.h
+++ b/arch/um/include/asm/kasan.h
@@ -24,7 +24,6 @@
#ifdef CONFIG_KASAN
void kasan_init(void);
-void kasan_map_memory(void *start, unsigned long len);
extern int kasan_um_is_ready;
#ifdef CONFIG_STATIC_LINK
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h
index 81bc38a2e3fc..95521b1f5b20 100644
--- a/arch/um/include/shared/kern_util.h
+++ b/arch/um/include/shared/kern_util.h
@@ -67,4 +67,6 @@ extern void fatal_sigsegv(void) __attribute__ ((noreturn));
void um_idle_sleep(void);
+void kasan_map_memory(void *start, size_t len);
+
#endif
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index 8530b2e08604..c6c9495b1432 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -15,6 +15,7 @@
#include <sys/vfs.h>
#include <linux/magic.h>
#include <init.h>
+#include <kern_util.h>
#include <os.h>
/*