Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 1 insertions, 16 deletions

diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index 9328b80..3e97fb1 100644
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -16,12 +16,11 @@
 #include <linux/export.h>
 #include <linux/sysctl.h>
 #include <linux/utsname.h>
-#include <trace/events/sched.h>
 
 /*
  * The number of tasks checked:
  */
-int __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT;
+unsigned long __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT;
 
 /*
  * Limit number of tasks checked in a batch.
@@ -93,9 +92,6 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
 		t->last_switch_count = switch_count;
 		return;
 	}
-
-	trace_sched_process_hang(t);
-
 	if (!sysctl_hung_task_warnings)
 		return;
 	sysctl_hung_task_warnings--;
@@ -207,14 +203,6 @@ int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
 	return ret;
 }
 
-static atomic_t reset_hung_task = ATOMIC_INIT(0);
-
-void reset_hung_task_detector(void)
-{
-	atomic_set(&reset_hung_task, 1);
-}
-EXPORT_SYMBOL_GPL(reset_hung_task_detector);
-
 /*
  * kthread which checks for tasks stuck in D state
  */
@@ -228,9 +216,6 @@ static int watchdog(void *dummy)
 		while (schedule_timeout_interruptible(timeout_jiffies(timeout)))
 			timeout = sysctl_hung_task_timeout_secs;
 
-		if (atomic_xchg(&reset_hung_task, 0))
-			continue;
-
 		check_hung_uninterruptible_tasks(timeout);
 	}