diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:15 -0400 |
| commit | 134cbf35c739bf89c51fd975a33a6b87507482c4 (patch) | |
| tree | c30536dcbb6e99a0f204879bbe5a19bfb27cccf8 /arch/x86/kernel/entry_64.S | |
| parent | 2feceeff1e771850e49f9074307f071964fd9e3e (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into x86/mm
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest 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 a331ec38af9e..38946c6e8433 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -1410,7 +1410,10 @@ ENTRY(paranoid_exit) | |||
| 1410 | paranoid_swapgs: | 1410 | paranoid_swapgs: |
| 1411 | TRACE_IRQS_IRETQ 0 | 1411 | TRACE_IRQS_IRETQ 0 |
| 1412 | SWAPGS_UNSAFE_STACK | 1412 | SWAPGS_UNSAFE_STACK |
| 1413 | RESTORE_ALL 8 | ||
| 1414 | jmp irq_return | ||
| 1413 | paranoid_restore: | 1415 | paranoid_restore: |
| 1416 | TRACE_IRQS_IRETQ 0 | ||
| 1414 | RESTORE_ALL 8 | 1417 | RESTORE_ALL 8 |
| 1415 | jmp irq_return | 1418 | jmp irq_return |
| 1416 | paranoid_userspace: | 1419 | paranoid_userspace: |