author | tao zeng <tao.zeng@amlogic.com> | 2017-12-25 02:36:14 (GMT) |
---|---|---|
committer | jie.yuan <jie.yuan@amlogic.com> | 2018-03-20 03:06:15 (GMT) |
commit | ad09151d3a5e783b8777927bfb63c5216f1543c9 (patch) | |
tree | 8b3869831c3126d35da43d5743ed5d27cd040fb1 | |
parent | 4aa7c08a2f4888cc7f912b751cd59fd633177ea2 (diff) | |
download | common-ad09151d3a5e783b8777927bfb63c5216f1543c9.zip common-ad09151d3a5e783b8777927bfb63c5216f1543c9.tar.gz common-ad09151d3a5e783b8777927bfb63c5216f1543c9.tar.bz2 |
memory: merge modification of tao.zeng [1/9]
mmext: fix panic caused by page trace
PD#157417: mmext: fix panic caused by page trace
stackframe.graph is not init if CONFIG_FUNCTION_GRAPH_TRACER
is opened.
Change-Id: Iea270dadd4579e71a778d0da764c4da27323938e
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
-rw-r--r-- | drivers/amlogic/memory_ext/page_trace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/amlogic/memory_ext/page_trace.c b/drivers/amlogic/memory_ext/page_trace.c index 22fa8a5..c44e205 100644 --- a/drivers/amlogic/memory_ext/page_trace.c +++ b/drivers/amlogic/memory_ext/page_trace.c @@ -394,6 +394,9 @@ static inline unsigned long find_back_trace(void) frame.fp = (unsigned long)__builtin_frame_address(0); frame.sp = current_stack_pointer; frame.pc = _RET_IP_; +#ifdef CONFIG_FUNCTION_GRAPH_TRACER + frame.graph = current->curr_ret_stack; +#endif while (1) { #ifdef CONFIG_ARM64 ret = unwind_frame(current, &frame); |