1 files changed, 4 insertions, 3 deletions

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index f1541b7e3244..57b8e2c25eda 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -31,6 +31,7 @@ int watchdog_enabled;
 int __read_mostly softlockup_thresh = 60;
 
 static DEFINE_PER_CPU(unsigned long, watchdog_touch_ts);
+static DEFINE_PER_CPU(bool, watchdog_nmi_touch);
 static DEFINE_PER_CPU(struct task_struct *, softlockup_watchdog);
 static DEFINE_PER_CPU(struct hrtimer, watchdog_hrtimer);
 static DEFINE_PER_CPU(bool, softlockup_touch_sync);
@@ -139,6 +140,7 @@ void touch_all_softlockup_watchdogs(void)
 
 void touch_nmi_watchdog(void)
 {
+        __get_cpu_var(watchdog_nmi_touch) = true;
         touch_softlockup_watchdog();
 }
 EXPORT_SYMBOL(touch_nmi_watchdog);
@@ -201,10 +203,9 @@ void watchdog_overflow_callback(struct perf_event *event, int nmi,
                  struct pt_regs *regs)
 {
         int this_cpu = smp_processor_id();
-        unsigned long touch_ts = per_cpu(watchdog_touch_ts, this_cpu);
 
-        if (touch_ts == 0) {
-                __touch_watchdog();
+        if (__get_cpu_var(watchdog_nmi_touch) == true) {
+                __get_cpu_var(watchdog_nmi_touch) = false;
                 return;
         }