Revert "watchdog: tegra_wdt: trigger FIQ if any CPU hangs"

This reverts commit 61c80149c7ade9564245bfb4e7f3151119b2bc8f.

Dependency for a later revert.

Reviewed-on: http://git-master/r/433770
(cherry picked from commit af13424775faa411548217a46ec5464668972015)

Change-Id: I2182ac2cde66541088983adb532a1bbfa057b394
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Arun Kannan <akannan@nvidia.com>
Reviewed-on: http://git-master/r/454836
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>
GVS: Gerrit_Virtual_Submit

diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index ad01b05b93964e0a7e68ba08bed05e130b4f9bf5..12f7cfa3e91e7c0defdeb9b69c7a8e438402efc1 100644 (file)
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -36,7 +36,6 @@
 #include <linux/spinlock.h>
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
-#include <linux/nmi.h>
 #ifdef CONFIG_TEGRA_FIQ_DEBUGGER
 #include <mach/irqs.h>
 #endif
@@ -158,8 +157,7 @@ static inline void tegra_wdt_ping(struct tegra_wdt *wdt)
 #if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \
        defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER)
        /* Comment out to test FIQ debugger */
-       if (!watchdog_get_lockup_state())
-               writel(WDT_CMD_START_COUNTER, wdt->wdt_avp_source + WDT_CMD);
+       writel(WDT_CMD_START_COUNTER, wdt->wdt_avp_source + WDT_CMD);
 #endif
 }