summaryrefslogtreecommitdiff
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-07-03 13:44:31 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-10 00:19:07 (GMT)
commit026ba355cd0372630c9266141a7ab45af1075020 (patch)
tree5fa08163cca213dd2fb817c8e67f2d32e6ecbfa7 /kernel/watchdog.c
parent00417c7d809cc169dabef50a51ea4912ac74c9d1 (diff)
downloadlinux-fsl-qoriq-026ba355cd0372630c9266141a7ab45af1075020.tar.xz
hrtimer: fixup hrtimer callback changes for preempt-rt
In preempt-rt we can not call the callbacks which take sleeping locks from the timer interrupt context. Bring back the softirq split for now, until we fixed the signal delivery problem for real. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/watchdog.c')
-rw-r--r--kernel/watchdog.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index cbad091..870b748 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -357,6 +357,7 @@ static void watchdog_enable(unsigned int cpu)
/* kick off the timer for the hardlockup detector */
hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
hrtimer->function = watchdog_timer_fn;
+ hrtimer->irqsafe = 1;
/* Enable the perf event */
watchdog_nmi_enable(cpu);