diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-28 09:00:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-28 09:00:48 -0500 |
| commit | 3bdae4f46445ea7cc9ee031d7ff106fdc6228669 (patch) | |
| tree | a44b445548dbf730535cfebd024e4cabadd4397c /arch/x86/kernel/entry_32.S | |
| parent | 9f1e87ea3ecb3c46c21f6a1a202ec82f99ed2473 (diff) | |
| parent | 5f5db591326779a80cfe490c5d6b6ce9fac08b31 (diff) | |
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.
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
| -rw-r--r-- | arch/x86/kernel/entry_32.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 6e96028d1a9c..fe7014176eb0 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
| @@ -847,6 +847,7 @@ ENTRY(kernel_thread_helper) | |||
| 847 | push %eax | 847 | push %eax |
| 848 | CFI_ADJUST_CFA_OFFSET 4 | 848 | CFI_ADJUST_CFA_OFFSET 4 |
| 849 | call do_exit | 849 | call do_exit |
| 850 | ud2 # padding for call trace | ||
| 850 | CFI_ENDPROC | 851 | CFI_ENDPROC |
| 851 | ENDPROC(kernel_thread_helper) | 852 | ENDPROC(kernel_thread_helper) |
| 852 | 853 | ||