Merge tag 'kvmarm-fixes-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmar...

[linux-2.6-block.git] / kernel / trace / fgraph.c

diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index 8dfd5021b9339ac2c5369607528fdadc4f8f64d1..7950a0356042a3f71026298dd4de563cd5180d4c 100644 (file)
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -276,7 +276,7 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx,
        int index = task->curr_ret_stack;
        int i;
 
-       if (ret != (unsigned long)return_to_handler)
+       if (ret != (unsigned long)dereference_kernel_function_descriptor(return_to_handler))
                return ret;
 
        if (index < 0)
@@ -294,7 +294,7 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx,
 {
        int task_idx;
 
-       if (ret != (unsigned long)return_to_handler)
+       if (ret != (unsigned long)dereference_kernel_function_descriptor(return_to_handler))
                return ret;
 
        task_idx = task->curr_ret_stack;