diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-10-25 08:01:10 -0400 |
|---|---|---|
| committer | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-10-25 08:01:10 -0400 |
| commit | 143a5d325d35efb1b29dcb8d6031cf27107e183a (patch) | |
| tree | def297c7608722df2b5a51e5e6acaacb1aeb1f97 /arch/x86/kernel/kprobes_64.c | |
| parent | c9927c2bf4f45bb85e8b502ab3fb79ad6483c244 (diff) | |
lockdep: fixup irq tracing
Ensure we fixup the IRQ state before we hit any locking code.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/kprobes_64.c')
| -rw-r--r-- | arch/x86/kernel/kprobes_64.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/kprobes_64.c b/arch/x86/kernel/kprobes_64.c index 681b801c5e26..3db3611933d8 100644 --- a/arch/x86/kernel/kprobes_64.c +++ b/arch/x86/kernel/kprobes_64.c | |||
| @@ -551,12 +551,7 @@ int __kprobes post_kprobe_handler(struct pt_regs *regs) | |||
| 551 | 551 | ||
| 552 | resume_execution(cur, regs, kcb); | 552 | resume_execution(cur, regs, kcb); |
| 553 | regs->eflags |= kcb->kprobe_saved_rflags; | 553 | regs->eflags |= kcb->kprobe_saved_rflags; |
| 554 | #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT | 554 | trace_hardirqs_fixup_flags(regs->eflags); |
| 555 | if (raw_irqs_disabled_flags(regs->eflags)) | ||
| 556 | trace_hardirqs_off(); | ||
| 557 | else | ||
| 558 | trace_hardirqs_on(); | ||
| 559 | #endif | ||
| 560 | 555 | ||
| 561 | /* Restore the original saved kprobes variables and continue. */ | 556 | /* Restore the original saved kprobes variables and continue. */ |
| 562 | if (kcb->kprobe_status == KPROBE_REENTER) { | 557 | if (kcb->kprobe_status == KPROBE_REENTER) { |