From 56252b9689672d3d8c43353336acfdd6431e3321 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 12 Sep 2011 13:40:05 +0200 Subject: [PATCH] --- yaml --- r: 269003 b: refs/heads/master c: cba9bd22a5f8f857534b9a7f3fb3cafa0ac5fb75 h: refs/heads/master i: 269001: 8e1880a8c69e9727507a11e1c45a796c0cdf3666 268999: 492b5df84213d8e00e749185056ee893a621eb06 v: v3 --- [refs] | 2 +- trunk/kernel/watchdog.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 493fbbd01ea3..f2dfa6d0aace 100644 --- 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 index e952a1394d26..d680381b0e9c 100644 --- 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, ¶m); @@ -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, ¶m); return 0; }