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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
Subject: watchdog: Fix possible soft lockup warning at bootup

Link: http://lkml.kernel.org/r/20200103151032.19590-1-longman@xxxxxxxxxx
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 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();
-
+	__touch_watchdog();
 	/* Enable the perf event */
 	if (watchdog_enabled & NMI_WATCHDOG_ENABLED)
 		watchdog_nmi_enable(cpu);
_

Patches currently in -mm which might be from longman@xxxxxxxxxx are

watchdog-fix-possible-soft-lockup-warning-at-bootup.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux