From: nikita <nikita>
Date: Thu, 7 Dec 2006 20:13:59 +0000 (+0000)
Subject: proc-sleep: fix possible interrupt deadlock.
X-Git-Tag: v1_8_0_110~486^2~29
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8370a7d78068936cfce99d0b0934436881ee3167;p=fs%2Flustre-release.git

proc-sleep: fix possible interrupt deadlock.
---

diff --git a/lustre/kernel_patches/patches/proc-sleep-2.6.9.patch b/lustre/kernel_patches/patches/proc-sleep-2.6.9.patch
index b4934c7..83464fe 100644
--- a/lustre/kernel_patches/patches/proc-sleep-2.6.9.patch
+++ b/lustre/kernel_patches/patches/proc-sleep-2.6.9.patch
@@ -269,7 +269,7 @@ Index: linux/kernel/sleep_info.c
 ===================================================================
 --- linux.orig/kernel/sleep_info.c
 +++ linux/kernel/sleep_info.c
-@@ -0,0 +1,423 @@
+@@ -0,0 +1,425 @@
 +#include <linux/config.h>
 +#include <linux/sleep_info.h>
 +#include <linux/seq_file.h>
@@ -279,6 +279,7 @@ Index: linux/kernel/sleep_info.c
 +#include <linux/proc_fs.h>
 +#include <linux/fs.h>
 +#include <linux/module.h>
++#include <linux/hardirq.h>
 +
 +#include <asm/div64.h>
 +#include <linux/errno.h>
@@ -687,7 +688,8 @@ Index: linux/kernel/sleep_info.c
 +
 +void stacktrace_record(void)
 +{
-+	update_sinfo(stack_sinfo.p, 1);
++	if (!in_interrupt())
++		update_sinfo(stack_sinfo.p, 1);
 +}
 +EXPORT_SYMBOL(stacktrace_record);
 +