From: "Tiwei Bie" <tiwei.btw@antgroup.com>
To: richard@nod.at, anton.ivanov@cambridgegreys.com,
johannes@sipsolutions.net
Cc: <linux-um@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
"Tiwei Bie" <tiwei.btw@antgroup.com>
Subject: [PATCH 4/7] um: Fix the declaration of kasan_map_memory
Date: Tue, 23 Apr 2024 19:24:54 +0800 [thread overview]
Message-ID: <20240423112457.2409319-5-tiwei.btw@antgroup.com> (raw)
In-Reply-To: <20240423112457.2409319-1-tiwei.btw@antgroup.com>
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>
---
arch/um/include/asm/kasan.h | 1 -
arch/um/include/shared/kern_util.h | 2 ++
arch/um/os-Linux/mem.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
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..1fa03499e1dc 100644
--- a/arch/um/include/shared/kern_util.h
+++ b/arch/um/include/shared/kern_util.h
@@ -37,6 +37,8 @@ extern void initial_thread_cb(void (*proc)(void *), void *arg);
extern void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
+extern void kasan_map_memory(void *start, size_t len);
+
extern void uml_pm_wake(void);
extern int start_uml(void);
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>
/*
--
2.34.1
next prev parent reply other threads:[~2024-04-23 11:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 11:24 [PATCH 0/7] um: A follow-up series of -Wmissing-prototypes fixes Tiwei Bie
2024-04-23 11:24 ` [PATCH 1/7] um: Fix -Wmissing-prototypes warnings for (rt_)sigreturn Tiwei Bie
2024-04-23 11:24 ` [PATCH 2/7] um: Fix the -Wmissing-prototypes warning for __switch_mm Tiwei Bie
2024-04-23 11:29 ` Johannes Berg
2024-04-23 12:11 ` Tiwei Bie
2024-04-23 11:24 ` [PATCH 3/7] um: Fix the -Wmissing-prototypes warning for get_thread_reg Tiwei Bie
2024-04-23 11:30 ` Johannes Berg
2024-04-23 11:24 ` Tiwei Bie [this message]
2024-04-23 11:24 ` [PATCH 5/7] um: Add an internal header shared among the user code Tiwei Bie
2024-04-23 11:30 ` Johannes Berg
2024-04-23 12:09 ` Tiwei Bie
2024-04-23 12:22 ` Johannes Berg
2024-04-23 12:29 ` Tiwei Bie
2024-04-23 11:24 ` [PATCH 6/7] um: Fix -Wmissing-prototypes warnings for __vdso_* Tiwei Bie
2024-04-23 11:24 ` [PATCH 7/7] um: Remove unused do_get_thread_area function Tiwei Bie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240423112457.2409319-5-tiwei.btw@antgroup.com \
--to=tiwei.btw@antgroup.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox