---

yaml --- r: 144170 b: refs/heads/master c: 0300e7f h: refs/heads/master v: v3
git-mirror · Apr 18, 2009 · a8dd43c · a8dd43c
1 parent a3b43b5
commit a8dd43c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8a250058656495be02c00de61e26b017c86ef00
+refs/heads/master: 0300e7f1a525ae4e4ac05344624adf0e5f13ea52
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
@@ -1410,7 +1410,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: