From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 13 Aug 2013 12:30:44 +0000 (+0200)
Subject: x86/watchdog: Tweak implementation given new common code
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6537
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=896934596614b44c20a37263c9decb0b639ef995;p=xen.git

x86/watchdog: Tweak implementation given new common code

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index 3eb2456836..2c16d937e0 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -435,8 +435,7 @@ void nmi_watchdog_tick(struct cpu_user_regs * regs)
 {
     unsigned int sum = this_cpu(nmi_timer_ticks);
 
-    if ( (this_cpu(last_irq_sums) == sum) &&
-         !atomic_read(&watchdog_disable_count) )
+    if ( (this_cpu(last_irq_sums) == sum) && watchdog_enabled() )
     {
         /*
          * Ayiee, looks like this CPU is stuck ... wait for the timeout