Merge branch 'linus' into tracing/core

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / entry_64.S

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 1ac99865591cbd90831cd7077723c9b430a333f3..987f91f0f7551b72093f7bfb03e9beffe5450a16 100644 (file)
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1397,7 +1397,10 @@ ENTRY(paranoid_exit)
 paranoid_swapgs:
        TRACE_IRQS_IRETQ 0
        SWAPGS_UNSAFE_STACK
+       RESTORE_ALL 8
+       jmp irq_return
 paranoid_restore:
+       TRACE_IRQS_IRETQ 0
        RESTORE_ALL 8
        jmp irq_return
 paranoid_userspace: