From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 22 Oct 2022 07:55:06 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/core, to resolve conflict
X-Git-Tag: v6.2-rc1~85^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd194611444caf7f30e9198b7e2b89522b257462;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'x86/urgent' into x86/core, to resolve conflict

There's a conflict between the call-depth tracking commits in x86/core:

  ee3e2469b346 ("x86/ftrace: Make it call depth tracking aware")
  36b64f101219 ("x86/ftrace: Rebalance RSB")
  eac828eaef29 ("x86/ftrace: Remove ftrace_epilogue()")

And these fixes in x86/urgent:

  883bbbffa5a4 ("ftrace,kcfi: Separate ftrace_stub() and ftrace_stub_graph()")
  b5f1fc318440 ("x86/ftrace: Remove ftrace_epilogue()")

It's non-trivial overlapping modifications - resolve them.

 Conflicts:
	arch/x86/kernel/ftrace_64.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

bd194611444caf7f30e9198b7e2b89522b257462
diff --cc arch/x86/kernel/ftrace_64.S
index 6a7e6d666a12b,2a4be92fd1444..1265ad519249c
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@@ -3,8 -3,8 +3,9 @@@
   *  Copyright (C) 2014  Steven Rostedt, Red Hat Inc
   */
  
 -#include <linux/linkage.h>
+ #include <linux/cfi_types.h>
 +#include <linux/linkage.h>
 +#include <asm/asm-offsets.h>
  #include <asm/ptrace.h>
  #include <asm/ftrace.h>
  #include <asm/export.h>
@@@ -130,6 -130,14 +131,16 @@@
  
  	.endm
  
+ SYM_TYPED_FUNC_START(ftrace_stub)
++	CALL_DEPTH_ACCOUNT
+ 	RET
+ SYM_FUNC_END(ftrace_stub)
+ 
+ SYM_TYPED_FUNC_START(ftrace_stub_graph)
++	CALL_DEPTH_ACCOUNT
+ 	RET
+ SYM_FUNC_END(ftrace_stub_graph)
+ 
  #ifdef CONFIG_DYNAMIC_FTRACE
  
  SYM_FUNC_START(__fentry__)
@@@ -305,13 -284,8 +311,10 @@@ STACK_FRAME_NON_STANDARD_FP(ftrace_regs
  #else /* ! CONFIG_DYNAMIC_FTRACE */
  
  SYM_FUNC_START(__fentry__)
 +	CALL_DEPTH_ACCOUNT
 +
  	cmpq $ftrace_stub, ftrace_trace_function
  	jnz trace
- 
- SYM_INNER_LABEL(ftrace_stub, SYM_L_GLOBAL)
- 	ENDBR
  	RET
  
  trace: