diff options
| author | Jan Beulich <JBeulich@novell.com> | 2010-09-02 08:54:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-03 02:14:10 -0400 |
| commit | 1f130a783a796f147b080c594488b566c86007d0 (patch) | |
| tree | dee3d22c3c7bd8176600bc7791d612c651c9672b /arch/x86/kernel/entry_64.S | |
| parent | e6b04b6b5a3182ae36cf9a69f1aaaee432edc8ad (diff) | |
x86-64: Adjust frame type at paranoid_exit:
As this isn't an exception or interrupt entry point, it doesn't
have any of the hardware provide frame layouts active.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
LKML-Reference: <4C7FBAA80200007800013F67@vpn.id2.novell.com>
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 16aeff0c3154..64dfe3045c13 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -1367,7 +1367,7 @@ paranoidzeroentry machine_check *machine_check_vector(%rip) | |||
| 1367 | 1367 | ||
| 1368 | /* ebx: no swapgs flag */ | 1368 | /* ebx: no swapgs flag */ |
| 1369 | ENTRY(paranoid_exit) | 1369 | ENTRY(paranoid_exit) |
| 1370 | INTR_FRAME | 1370 | DEFAULT_FRAME |
| 1371 | DISABLE_INTERRUPTS(CLBR_NONE) | 1371 | DISABLE_INTERRUPTS(CLBR_NONE) |
| 1372 | TRACE_IRQS_OFF | 1372 | TRACE_IRQS_OFF |
| 1373 | testl %ebx,%ebx /* swapgs needed? */ | 1373 | testl %ebx,%ebx /* swapgs needed? */ |