Commit 876e7a38 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64: traps: simplify die() and __die()

In arm64's die and __die routines we pass around a thread_info, and
subsequently use this to determine the relevant task_struct, and the end
of the thread's stack. Subsequent patches will decouple thread_info from
the stack, and this approach will no longer work.

To figure out the end of the stack, we can use the new generic
end_of_stack() helper. As we only call __die() from die(), and die()
always deals with the current task, we can remove the parameter and have
both acquire current directly, which also makes it clear that __die
can't be called for arbitrary tasks.
Signed-off-by: default avatarMark Rutland <>
Tested-by: default avatarLaura Abbott <>
Cc: Will Deacon <>
Signed-off-by: default avatarCatalin Marinas <>
parent a9ea0017
......@@ -228,10 +228,9 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
#define S_SMP " SMP"
static int __die(const char *str, int err, struct thread_info *thread,
struct pt_regs *regs)
static int __die(const char *str, int err, struct pt_regs *regs)
struct task_struct *tsk = thread->task;
struct task_struct *tsk = current;
static int die_counter;
int ret;
......@@ -246,7 +245,8 @@ static int __die(const char *str, int err, struct thread_info *thread,
pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",
TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk),
if (!user_mode(regs)) {
dump_mem(KERN_EMERG, "Stack: ", regs->sp,
......@@ -265,7 +265,6 @@ static DEFINE_RAW_SPINLOCK(die_lock);
void die(const char *str, struct pt_regs *regs, int err)
struct thread_info *thread = current_thread_info();
int ret;
......@@ -273,9 +272,9 @@ void die(const char *str, struct pt_regs *regs, int err)
ret = __die(str, err, thread, regs);
ret = __die(str, err, regs);
if (regs && kexec_should_crash(thread->task))
if (regs && kexec_should_crash(current))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment