]> git.baikalelectronics.ru Git - kernel.git/commitdiff
h8300: Fix build errors from do_exit() to make_task_dead() transition
authorNathan Chancellor <nathan@kernel.org>
Mon, 27 Dec 2021 18:48:50 +0000 (11:48 -0700)
committerEric W. Biederman <ebiederm@xmission.com>
Sat, 8 Jan 2022 15:42:24 +0000 (09:42 -0600)
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: 238bcd2dab75 ("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>
arch/h8300/kernel/traps.c
arch/h8300/mm/fault.c

index 3d4e0bde37ae7dc65520a05730d44486a848a8f8..a92c39e03802eb368371c30a83588fb5b1e8c9c6 100644 (file)
@@ -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;
index 0223528565dd3d268a241b2ad163c3179f5adc0b..b465441f490df87edab337ace91fdc949bbac4bf 100644 (file)
@@ -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;
 }