[folded-merged] watchdog-fix-possible-soft-lockup-warning-at-bootup-v2.patch removed from -mm tree

[folded-merged] watchdog-fix-possible-soft-lockup-warning-at-bootup-v2.patch removed from -mm tree

[akpm]

The patch titled
     Subject: watchdog: Fix possible soft lockup warning at bootup
has been removed from the -mm tree.  Its filename was
     watchdog-fix-possible-soft-lockup-warning-at-bootup-v2.patch

This patch was dropped because it was folded into watchdog-fix-possible-soft-lockup-warning-at-bootup.patch

------------------------------------------------------
From: Waiman Long <longman@redhat.com>
Subject: watchdog: Fix possible soft lockup warning at bootup

Link: http://lkml.kernel.org/r/20200103151032.19590-1-longman@redhat.com
Signed-off-by: Waiman Long <longman@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/watchdog.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/kernel/watchdog.c~watchdog-fix-possible-soft-lockup-warning-at-bootup-v2
+++ a/kernel/watchdog.c
@@ -496,9 +496,7 @@ static void watchdog_enable(unsigned int
 		      HRTIMER_MODE_REL_PINNED_HARD);
 
 	/* Initialize timestamp */
-	if (system_state != SYSTEM_BOOTING)
-		__touch_watchdog();