diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /arch/x86/kernel/entry_64.S | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 1ac99865591c..987f91f0f755 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -1397,7 +1397,10 @@ ENTRY(paranoid_exit) | |||
| 1397 | paranoid_swapgs: | 1397 | paranoid_swapgs: |
| 1398 | TRACE_IRQS_IRETQ 0 | 1398 | TRACE_IRQS_IRETQ 0 |
| 1399 | SWAPGS_UNSAFE_STACK | 1399 | SWAPGS_UNSAFE_STACK |
| 1400 | RESTORE_ALL 8 | ||
| 1401 | jmp irq_return | ||
| 1400 | paranoid_restore: | 1402 | paranoid_restore: |
| 1403 | TRACE_IRQS_IRETQ 0 | ||
| 1401 | RESTORE_ALL 8 | 1404 | RESTORE_ALL 8 |
| 1402 | jmp irq_return | 1405 | jmp irq_return |
| 1403 | paranoid_userspace: | 1406 | paranoid_userspace: |