From: Nathan Chancellor <nathan@kernel.org>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Brian Cain <bcain@codeaurora.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Guo Ren <guoren@kernel.org>,
linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH 2/3] h8300: Fix build errors from do_exit() to make_task_dead() transition
Date: Mon, 27 Dec 2021 11:48:50 -0700 [thread overview]
Message-ID: <20211227184851.2297759-3-nathan@kernel.org> (raw)
In-Reply-To: <20211227184851.2297759-1-nathan@kernel.org>
When building ARCH=h8300 defconfig:
arch/h8300/kernel/traps.c: In function 'die':
arch/h8300/kernel/traps.c:109:2: error: implicit declaration of function
'make_dead_task' [-Werror=implicit-function-declaration]
109 | make_dead_task(SIGSEGV);
| ^~~~~~~~~~~~~~
arch/h8300/mm/fault.c: In function 'do_page_fault':
arch/h8300/mm/fault.c:54:2: error: implicit declaration of function
'make_dead_task' [-Werror=implicit-function-declaration]
54 | make_dead_task(SIGKILL);
| ^~~~~~~~~~~~~~
The function's name is make_task_dead(), change it so there is no more
build error.
Additionally, include linux/sched/task.h in arch/h8300/kernel/traps.c
to avoid the same error because do_exit()'s declaration is in kernel.h
but make_task_dead()'s is in task.h, which is not included in traps.c.
Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
arch/h8300/kernel/traps.c | 3 ++-
arch/h8300/mm/fault.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c
index 3d4e0bde37ae..a92c39e03802 100644
--- a/arch/h8300/kernel/traps.c
+++ b/arch/h8300/kernel/traps.c
@@ -17,6 +17,7 @@
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/sched/debug.h>
+#include <linux/sched/task.h>
#include <linux/mm_types.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -106,7 +107,7 @@ void die(const char *str, struct pt_regs *fp, unsigned long err)
dump(fp);
spin_unlock_irq(&die_lock);
- make_dead_task(SIGSEGV);
+ make_task_dead(SIGSEGV);
}
static int kstack_depth_to_print = 24;
diff --git a/arch/h8300/mm/fault.c b/arch/h8300/mm/fault.c
index 0223528565dd..b465441f490d 100644
--- a/arch/h8300/mm/fault.c
+++ b/arch/h8300/mm/fault.c
@@ -51,7 +51,7 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
printk(" at virtual address %08lx\n", address);
if (!user_mode(regs))
die("Oops", regs, error_code);
- make_dead_task(SIGKILL);
+ make_task_dead(SIGKILL);
return 1;
}
--
2.34.1
next prev parent reply other threads:[~2021-12-27 18:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 18:48 [PATCH 0/3] Fix build errors with do_exit() to make_task_dead() transition Nathan Chancellor
2021-12-27 18:48 ` [PATCH 1/3] hexagon: Fix function name in die() Nathan Chancellor
2021-12-27 18:48 ` Nathan Chancellor [this message]
2021-12-27 18:48 ` [PATCH 3/3] csky: Fix function name in csky_alignment() and die() Nathan Chancellor
2021-12-28 1:46 ` Guo Ren
2021-12-28 1:47 ` Guo Ren
2021-12-28 1:53 ` Guo Ren
2021-12-28 2:01 ` Guo Ren
2021-12-28 2:18 ` Nathan Chancellor
2021-12-28 2:50 ` Guo Ren
2021-12-29 16:29 ` Eric W. Biederman
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=20211227184851.2297759-3-nathan@kernel.org \
--to=nathan@kernel.org \
--cc=bcain@codeaurora.org \
--cc=ebiederm@xmission.com \
--cc=guoren@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/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