diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-16 09:55:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-16 09:55:49 -0800 |
| commit | d8c89eb3a12f0da96d049bd515c7fa3702e511c5 (patch) | |
| tree | 1d9869248413dc96b935910744064d7982fd300a /arch | |
| parent | 456ef1553cb2b06729d64c1d1f0f2bda34e9b201 (diff) | |
| parent | fb1dac909d94ff807cd833d340c6827c3a957159 (diff) | |
| download | op-kernel-dev-d8c89eb3a12f0da96d049bd515c7fa3702e511c5.zip op-kernel-dev-d8c89eb3a12f0da96d049bd515c7fa3702e511c5.tar.gz | |
Merge branch 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep
* 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
lockdep: more hardirq annotations for notify_die()
lockdep: fix workqueue creation API lockdep interaction
lockdep: fix internal double unlock during self-test
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/traps_32.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/traps_64.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index c88bbff..02d1e1e 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c @@ -541,6 +541,7 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \ info.si_errno = 0; \ info.si_code = sicode; \ info.si_addr = (void __user *)siaddr; \ + trace_hardirqs_fixup(); \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ == NOTIFY_STOP) \ return; \ diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index d11525a..cc68b923 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c @@ -635,6 +635,7 @@ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \ info.si_errno = 0; \ info.si_code = sicode; \ info.si_addr = (void __user *)siaddr; \ + trace_hardirqs_fixup(); \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ == NOTIFY_STOP) \ return; \ |
