From c8f60a2404c8e540a2ca8f99193ae0fc155b819e Mon Sep 17 00:00:00 2001 From: jia zhang Date: Sun, 23 Nov 2008 22:47:10 +0800 Subject: [PATCH] --- yaml --- r: 120814 b: refs/heads/master c: 5f5db591326779a80cfe490c5d6b6ce9fac08b31 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_32.S | 1 + trunk/arch/x86/kernel/entry_64.S | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index de5daf85bf79..87e158243ed0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f377fa123d0ec621e8e361ecc3f2a8ee70e81a2e +refs/heads/master: 5f5db591326779a80cfe490c5d6b6ce9fac08b31 diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S index 28b597ef9ca1..f6402c4ba10d 100644 --- a/trunk/arch/x86/kernel/entry_32.S +++ b/trunk/arch/x86/kernel/entry_32.S @@ -1051,6 +1051,7 @@ ENTRY(kernel_thread_helper) push %eax CFI_ADJUST_CFA_OFFSET 4 call do_exit + ud2 # padding for call trace CFI_ENDPROC ENDPROC(kernel_thread_helper) diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index ddeeb1052583..4a16bf31c783 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -1172,6 +1172,7 @@ child_rip: # exit mov %eax, %edi call do_exit + ud2 # padding for call trace CFI_ENDPROC ENDPROC(child_rip)