From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 28 Nov 2008 14:00:37 +0000 (+0100)
Subject: Merge branch 'x86/debug' into x86/irq
X-Git-Tag: firefly_0821_release~13973^2~569^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3bdae4f46445ea7cc9ee031d7ff106fdc6228669;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86/debug' into x86/irq

We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount of activity went into x86/irq, they became
dependent. Resolve that by this cross-merge.
---

3bdae4f46445ea7cc9ee031d7ff106fdc6228669
diff --cc arch/x86/kernel/entry_64.S
index 08c0c9777a09,4a16bf31c783..e41734a537bd
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@@ -373,15 -255,17 +373,17 @@@ ENTRY(ret_from_fork
  	call schedule_tail
  	GET_THREAD_INFO(%rcx)
  	testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
+ 	CFI_REMEMBER_STATE
  	jnz rff_trace
 -rff_action:	
 +rff_action:
  	RESTORE_REST
  	testl $3,CS-ARGOFFSET(%rsp)	# from kernel_thread?
  	je   int_ret_from_sys_call
  	testl $_TIF_IA32,TI_flags(%rcx)
  	jnz  int_ret_from_sys_call
 -	RESTORE_TOP_OF_STACK %rdi,ARGOFFSET
 +	RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET
  	jmp ret_from_sys_call
+ 	CFI_RESTORE_STATE
  rff_trace:
  	movq %rsp,%rdi
  	call syscall_trace_leave
@@@ -1173,8 -1172,9 +1175,9 @@@ ENTRY(child_rip
  	# exit
  	mov %eax, %edi
  	call do_exit
+ 	ud2			# padding for call trace
  	CFI_ENDPROC
 -ENDPROC(child_rip)
 +END(child_rip)
  
  /*
   * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.