1 files changed, 4 insertions, 1 deletions

diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
index cfd46c227c8c..a99eff9afc1f 100644
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@ -43,6 +43,9 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame)
         unsigned long fp = frame->fp;
         unsigned long irq_stack_ptr;
 
+        if (!tsk)
+                tsk = current;
+
         /*
          * Switching between stacks is valid when tracing current and in
          * non-preemptible context.
@@ -67,7 +70,7 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame)
         frame->pc = *(unsigned long *)(fp + 8);
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-        if (tsk && tsk->ret_stack &&
+        if (tsk->ret_stack &&
                         (frame->pc == (unsigned long)return_to_handler)) {
                 /*
                  * This is a case where function graph tracer has