diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 16:31:36 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 16:31:36 +0200 |
| commit | 31e77ac55f18db0ec1c724840927562ef3093ef6 (patch) | |
| tree | 01bb0ac2868debd2246df4c5e5617a2ce9f09600 /arch/x86_64/kernel/entry.S | |
| parent | [GFS2] Tidy up locking code (diff) | |
| parent | Linux 2.6.18-rc6 (diff) | |
| download | linux-31e77ac55f18db0ec1c724840927562ef3093ef6.tar.xz linux-31e77ac55f18db0ec1c724840927562ef3093ef6.zip | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/x86_64/kernel/entry.S')
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index 6f810424df44..aa8d8939abc1 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S @@ -973,6 +973,8 @@ ENTRY(kernel_thread) ENDPROC(kernel_thread) child_rip: + pushq $0 # fake return address + CFI_STARTPROC /* * Here we are in the child and the registers are set as they were * at kernel_thread() invocation in the parent. @@ -983,6 +985,7 @@ child_rip: # exit xorl %edi, %edi call do_exit + CFI_ENDPROC ENDPROC(child_rip) /* |