summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-26 14:03:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:21:53 +0200
commit6b11d4ef3e4d6ce83fb177aa50fdf385abb17d1a (patch)
treee162ee00eb7cbd3020d471370c51b728c316983d /arch/x86
parent2e42060c19cb79adacc48beb5e9ec5361df976a2 (diff)
downloadlinux-6b11d4ef3e4d6ce83fb177aa50fdf385abb17d1a.tar.bz2
traps: x86_64: add TRACE_IRQS_OFF in error_entry
Add TRACE_IRQS_OFF just before entering the C code. All exceptions are taken via interrupt gates. If irq tracing is enabled, it should be notified as soon as possible. Interrupts are only (conditionally) re-enabled in C code. Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/entry_64.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 25bb3f9b2552..963b35b81bcc 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/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