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 v2 4/6] um: Fix the return type of __switch_to
Date: Mon, 05 Feb 2024 19:47:06 +0800 [thread overview]
Message-ID: <20240205114708.25235-5-tiwei.btw@antgroup.com> (raw)
In-Reply-To: <20240205114708.25235-1-tiwei.btw@antgroup.com>
Make it match the declaration in asm-generic/switch_to.h. And
also include the header to allow the compiler to check it.
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
---
arch/um/kernel/process.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 292c8014aaa6..a7607ef1b02f 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -26,6 +26,7 @@
#include <linux/resume_user_mode.h>
#include <asm/current.h>
#include <asm/mmu_context.h>
+#include <asm/switch_to.h>
#include <linux/uaccess.h>
#include <as-layout.h>
#include <kern_util.h>
@@ -73,7 +74,7 @@ static inline void set_current(struct task_struct *task)
extern void arch_switch_to(struct task_struct *to);
-void *__switch_to(struct task_struct *from, struct task_struct *to)
+struct task_struct *__switch_to(struct task_struct *from, struct task_struct *to)
{
to->thread.prev_sched = from;
set_current(to);
--
2.34.1
next prev parent reply other threads:[~2024-02-05 11:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 11:47 [PATCH v2 0/6] um: Minor fixes and cleanups Tiwei Bie
2024-02-05 11:47 ` [PATCH v2 1/6] um: Make local functions and variables static Tiwei Bie
2024-02-05 11:47 ` [PATCH v2 2/6] um: Fix the declaration of vfree Tiwei Bie
2024-02-05 11:47 ` [PATCH v2 3/6] um: Remove unused functions Tiwei Bie
2024-02-05 11:47 ` Tiwei Bie [this message]
2024-02-05 11:47 ` [PATCH v2 5/6] um: Add missing headers Tiwei Bie
2024-02-05 11:47 ` [PATCH v2 6/6] um: Stop tracking host PID in cpu_tasks 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=20240205114708.25235-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
all inboxes | Powered by JetHome®