From: Eric Biggers <ebiggers@kernel.org>
To: stable@vger.kernel.org
Cc: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>,
Kees Cook <keescook@chromium.org>, SeongJae Park <sj@kernel.org>,
Seth Jenkins <sethjenkins@google.com>,
Jann Horn <jannh@google.com>,
"Eric W . Biederman" <ebiederm@xmission.com>,
linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH 4.14 07/16] h8300: Fix build errors from do_exit() to make_task_dead() transition
Date: Wed, 1 Feb 2023 21:43:57 -0800 [thread overview]
Message-ID: <20230202054406.221721-8-ebiggers@kernel.org> (raw)
In-Reply-To: <20230202054406.221721-1-ebiggers@kernel.org>
From: Nathan Chancellor <nathan@kernel.org>
commit ab4ababdf77ccc56c7301c751dff49c79709c51c upstream.
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>
Link: https://lkml.kernel.org/r/20211227184851.2297759-3-nathan@kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
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 a284c126f07a6..090adaee4b84c 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>
@@ -110,7 +111,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 a8d8fc63780e4..573825c3cb708 100644
--- a/arch/h8300/mm/fault.c
+++ b/arch/h8300/mm/fault.c
@@ -52,7 +52,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.39.1
next prev parent reply other threads:[~2023-02-02 5:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 5:43 [PATCH 4.14 00/16] Backport oops_limit to 4.14 Eric Biggers
2023-02-02 5:43 ` [PATCH 4.14 01/16] sysctl: add a new register_sysctl_init() interface Eric Biggers
2023-02-02 5:43 ` [PATCH 4.14 02/16] panic: unset panic_on_warn inside panic() Eric Biggers
2023-02-02 5:43 ` [PATCH 4.14 03/16] mm: kasan: do not panic if both panic_on_warn and kasan_multishot set Eric Biggers
2023-02-02 5:43 ` [PATCH 4.14 04/16] exit: Add and use make_task_dead Eric Biggers
2023-02-02 5:43 ` [PATCH 4.14 05/16] objtool: Add a missing comma to avoid string concatenation Eric Biggers
2023-02-02 5:43 ` [PATCH 4.14 06/16] hexagon: Fix function name in die() Eric Biggers
2023-02-02 5:43 ` Eric Biggers [this message]
2023-02-02 5:43 ` [PATCH 4.14 08/16] ia64: make IA64_MCA_RECOVERY bool instead of tristate Eric Biggers
2023-02-02 5:43 ` [PATCH 4.14 09/16] exit: Put an upper limit on how often we can oops Eric Biggers
2023-02-02 5:44 ` [PATCH 4.14 10/16] exit: Expose "oops_count" to sysfs Eric Biggers
2023-02-02 5:44 ` [PATCH 4.14 11/16] exit: Allow oops_limit to be disabled Eric Biggers
2023-02-02 5:44 ` [PATCH 4.14 12/16] panic: Consolidate open-coded panic_on_warn checks Eric Biggers
2023-02-02 5:44 ` [PATCH 4.14 13/16] panic: Introduce warn_limit Eric Biggers
2023-02-02 5:44 ` [PATCH 4.14 14/16] panic: Expose "warn_count" to sysfs Eric Biggers
2023-02-02 5:44 ` [PATCH 4.14 15/16] docs: Fix path paste-o for /sys/kernel/warn_count Eric Biggers
2023-02-02 5:44 ` [PATCH 4.14 16/16] exit: Use READ_ONCE() for all oops/warn limit reads Eric Biggers
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=20230202054406.221721-8-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=ebiederm@xmission.com \
--cc=harshit.m.mogalapalli@oracle.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=sethjenkins@google.com \
--cc=sj@kernel.org \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).