]> git.hungrycats.org Git - linux/commitdiff
x86-64: Adjust frame type at paranoid_exit:
authorJan Beulich <JBeulich@novell.com>
Thu, 2 Sep 2010 12:54:32 +0000 (13:54 +0100)
committerWilly Tarreau <w@1wt.eu>
Sat, 13 Dec 2014 14:16:06 +0000 (15:16 +0100)
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>
(cherry picked from commit 1f130a783a796f147b080c594488b566c86007d0)
[WT: only merged to minimize changes from mainline in entry_64.S]
Signed-off-by: Willy Tarreau <w@1wt.eu>
arch/x86/kernel/entry_64.S

index 4f577eb916e00590f0888af7723558daa46462bd..fb402d5cca8471193b296ce49618d284c8b26979 100644 (file)
@@ -1400,7 +1400,7 @@ paranoidzeroentry machine_check *machine_check_vector(%rip)
 
        /* ebx: no swapgs flag */
 ENTRY(paranoid_exit)
-       INTR_FRAME
+       DEFAULT_FRAME
        DISABLE_INTERRUPTS(CLBR_NONE)
        TRACE_IRQS_OFF
        testl %ebx,%ebx                         /* swapgs needed? */