Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

[Guo Ren]

Hi Nathan,

Three wrong parts in csky! you forgot mm/fault.c.

Eric's patch seems not to cc me? Why arm64 is correct, csky is wrong. -_*!

here is the wrong patch part:
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 9ae24e3b72be1..11a28cace2d25 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -302,7 +302,7 @@ static void die_kernel_fault(const char *msg,
unsigned long addr,
show_pte(addr);
die("Oops", regs, esr);
bust_spinlocks(0);
- do_exit(SIGKILL);
+ make_task_dead(SIGKILL);
}
#ifdef CONFIG_KASAN_HW_TAGS
diff --git a/arch/csky/abiv1/alignment.c b/arch/csky/abiv1/alignment.c
index cb2a0d94a144d..5e2fb45d605cf 100644
--- a/arch/csky/abiv1/alignment.c
+++ b/arch/csky/abiv1/alignment.c
@@ -294,7 +294,7 @@ bad_area:
__func__, opcode, rz, rx, imm, addr);
show_regs(regs);
bust_spinlocks(0);
- do_exit(SIGKILL);
+ make_dead_task(SIGKILL);
}
force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr);
diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c
index e5fbf8653a215..88a47035b9256 100644
--- a/arch/csky/kernel/traps.c
+++ b/arch/csky/kernel/traps.c
@@ -109,7 +109,7 @@ void die(struct pt_regs *regs, const char *str)
if (panic_on_oops)
panic("Fatal exception");
if (ret != NOTIFY_STOP)
- do_exit(SIGSEGV);
+ make_dead_task(SIGSEGV);
}
void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr)
diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c
index 466ad949818a6..7215a46b6b8eb 100644
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
@@ -67,7 +67,7 @@ static inline void no_context(struct pt_regs *regs,
unsigned long addr)
pr_alert("Unable to handle kernel paging request at virtual "
"addr 0x%08lx, pc: 0x%08lx\n", addr, regs->pc);
die(regs, "Oops");
- do_exit(SIGKILL);
+ make_task_dead(SIGKILL);
}

On Tue, Dec 28, 2021 at 2:50 AM Nathan Chancellor <nathan@xxxxxxxxxx> wrote:
>
> When building ARCH=csky defconfig:
>
> arch/csky/kernel/traps.c: In function 'die':
> arch/csky/kernel/traps.c:112:17: error: implicit declaration of function
> 'make_dead_task' [-Werror=implicit-function-declaration]
>   112 |                 make_dead_task(SIGSEGV);
>       |                 ^~~~~~~~~~~~~~
>
> The function's name is make_task_dead(), change it so there is no more
> build error.
>
> Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.")
> Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
> ---
>  arch/csky/abiv1/alignment.c | 2 +-
>  arch/csky/kernel/traps.c    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/csky/abiv1/alignment.c b/arch/csky/abiv1/alignment.c
> index 5e2fb45d605c..2df115d0e210 100644
> --- a/arch/csky/abiv1/alignment.c
> +++ b/arch/csky/abiv1/alignment.c
> @@ -294,7 +294,7 @@ void csky_alignment(struct pt_regs *regs)
>                                 __func__, opcode, rz, rx, imm, addr);
>                 show_regs(regs);
>                 bust_spinlocks(0);
> -               make_dead_task(SIGKILL);
> +               make_task_dead(SIGKILL);
>         }
>
>         force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr);
> diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c
> index 88a47035b925..50481d12d236 100644
> --- a/arch/csky/kernel/traps.c
> +++ b/arch/csky/kernel/traps.c
> @@ -109,7 +109,7 @@ void die(struct pt_regs *regs, const char *str)
>         if (panic_on_oops)
>                 panic("Fatal exception");
>         if (ret != NOTIFY_STOP)
> -               make_dead_task(SIGSEGV);
> +               make_task_dead(SIGSEGV);
>  }
>
>  void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr)
> --
> 2.34.1
>


-- 
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/