---

yaml --- r: 113538 b: refs/heads/master c: 6b11d4e h: refs/heads/master v: v3
git-mirror · Oct 13, 2008 · eb1ebf0 · eb1ebf0
1 parent b4dcc43
commit eb1ebf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e42060c19cb79adacc48beb5e9ec5361df976a2
+refs/heads/master: 6b11d4ef3e4d6ce83fb177aa50fdf385abb17d1a
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
@@ -1065,7 +1065,8 @@ KPROBE_ENTRY(error_entry)
 	je  error_kernelspace
 error_swapgs:	
 	SWAPGS
-error_sti:	
+error_sti:
+	TRACE_IRQS_OFF
 	movq %rdi,RDI(%rsp) 	
 	CFI_REL_OFFSET	rdi,RDI
 	movq %rsp,%rdi