diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:42:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:42:52 -0400 |
commit | a7e1e001f432d5960b929787a2a261cf5a7ddac5 (patch) | |
tree | b340cb74237427dbdbdacf618c42e8b0bd8d21d5 /arch/x86/kernel/traps_32.c | |
parent | 21806261b6cc1068197ea6c8891b857f16260fee (diff) | |
parent | 17aacfb9cdf9a8329a6ece9c437551a29c93e47b (diff) |
Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep
* 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
lockdep: fix a typo in the __lock_acquire comment
sched: fix unconditional irq lock
lockdep: fixup irq tracing
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
-rw-r--r-- | arch/x86/kernel/traps_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index cc9acace7e23..298d13ed3ab3 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -789,6 +789,8 @@ void restart_nmi(void) | |||
789 | #ifdef CONFIG_KPROBES | 789 | #ifdef CONFIG_KPROBES |
790 | fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code) | 790 | fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code) |
791 | { | 791 | { |
792 | trace_hardirqs_fixup(); | ||
793 | |||
792 | if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) | 794 | if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) |
793 | == NOTIFY_STOP) | 795 | == NOTIFY_STOP) |
794 | return; | 796 | return; |