diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:47:05 -0400 |
| commit | e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch) | |
| tree | 4ba588631dd8189a818a91c9e3976526071178b6 /arch/x86/kernel/entry_64.S | |
| parent | 1130b0296184bc21806225fd06d533515a99d2db (diff) | |
| parent | 56a50adda49b2020156616c4eb15353e0f9ad7de (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
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 1d46cba56fd8..891004619142 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -1417,7 +1417,10 @@ ENTRY(paranoid_exit) | |||
| 1417 | paranoid_swapgs: | 1417 | paranoid_swapgs: |
| 1418 | TRACE_IRQS_IRETQ 0 | 1418 | TRACE_IRQS_IRETQ 0 |
| 1419 | SWAPGS_UNSAFE_STACK | 1419 | SWAPGS_UNSAFE_STACK |
| 1420 | RESTORE_ALL 8 | ||
| 1421 | jmp irq_return | ||
| 1420 | paranoid_restore: | 1422 | paranoid_restore: |
| 1423 | TRACE_IRQS_IRETQ 0 | ||
| 1421 | RESTORE_ALL 8 | 1424 | RESTORE_ALL 8 |
| 1422 | jmp irq_return | 1425 | jmp irq_return |
| 1423 | paranoid_userspace: | 1426 | paranoid_userspace: |