Unverified Commit bfe6971a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10704 x86: stop playing stack games in profile_pc() 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HU3A6EKNWRY65RQJHTUSGZKNNZL3S237/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEPC 
 
Link:https://gitee.com/openeuler/kernel/pulls/10704

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 456b68d7 8fc22a9d

arch/x86/kernel/time.c

+1 −10
Original line number Diff line number Diff line
@@ -28,16 +28,7 @@ 


unsigned long profile_pc(struct pt_regs *regs)

{

	unsigned long pc = instruction_pointer(regs);



	if (!user_mode(regs) && in_lock_functions(pc)) {

		struct unwind_state state;



		/* unwind_start will skip the first regs frame */

		unwind_start(&state, current, regs, NULL);

		pc = unwind_get_return_address(&state);

	}

	return pc;

	return instruction_pointer(regs);

}

EXPORT_SYMBOL(profile_pc);