diff options
| author | Andrew Cooper <andrew.cooper3@citrix.com> | 2013-08-13 14:30:44 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-08-13 14:30:44 +0200 |
| commit | 896934596614b44c20a37263c9decb0b639ef995 (patch) | |
| tree | a4b261f9bec4b334fd67f0c07f14dc2ffe493e52 /xen/arch/x86/nmi.c | |
| parent | c8177e691f0f611240853326712d43482ec949bf (diff) | |
| download | xen-896934596614b44c20a37263c9decb0b639ef995.tar.gz xen-896934596614b44c20a37263c9decb0b639ef995.tar.bz2 xen-896934596614b44c20a37263c9decb0b639ef995.zip | |
x86/watchdog: Tweak implementation given new common code
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/nmi.c')
| -rw-r--r-- | xen/arch/x86/nmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 |