---

yaml --- r: 269003 b: refs/heads/master c: cba9bd2 h: refs/heads/master i: 269001: 8e1880a 268999: 492b5df v: v3
git-mirror · Sep 18, 2011 · 56252b9 · 56252b9
1 parent 7ee29d9
commit 56252b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51887c8230d57c4d9cc68e3784c52c8f0a708655
+refs/heads/master: cba9bd22a5f8f857534b9a7f3fb3cafa0ac5fb75
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
@@ -321,7 +321,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
  */
 static int watchdog(void *unused)
 {
-	static struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
+	struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
 	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
 
 	sched_setscheduler(current, SCHED_FIFO, &param);
@@ -350,7 +350,8 @@ static int watchdog(void *unused)
 		set_current_state(TASK_INTERRUPTIBLE);
 	}
 	__set_current_state(TASK_RUNNING);
-
+	param.sched_priority = 0;
+	sched_setscheduler(current, SCHED_NORMAL, &param);
 	return 0;
 }