path: root/kernel
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-21 19:25:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-21 19:25:14 -0700
commit5ec29e3149d800e6db83c1b6ff441daf319cbbe2 (patch)
treeb23ecaff7078590215e91b2b6aa4c90c2d923e10 /kernel
parentabd209b7083b2f3a2a19e522f688e7569f284e5d (diff)
parent6ff968cca1dfebd4b6fcade87c11658dbfc96932 (diff)
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core locking updates from Ingo Molnar: "This update: - extends and simplifies x86 NMI callback handling code to enhance and fix the HP hw-watchdog driver - simplifies the x86 NMI callback handling code to fix a kmemcheck bug. - enhances the hung-task debugger" * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/nmi: Fix the type of the nmiaction.flags field x86/nmi: Fix page faults by nmiaction if kmemcheck is enabled x86/nmi: Add new NMI queues to deal with IO_CHK and SERR watchdog, hpwdt: Remove priority option for NMI callback hung task debugging: Inject NMI when hung and going to panic
Diffstat (limited to 'kernel')
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index c21449f85a2..6df614912b9 100644
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -108,8 +108,10 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
- if (sysctl_hung_task_panic)
+ if (sysctl_hung_task_panic) {
+ trigger_all_cpu_backtrace();
panic("hung_task: blocked tasks");
+ }