Skip to contentSkip to conversation

+ watchdog-fix-possible-soft-lockup-warning-at-bootup-v2.patch added to -mm tree

DISCUSSION Thomas Gleixner 2 participants 2 messages Jan 16, 2020 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20200107233656.GS5UK5wEy%[email protected]

#1 lore raw
Quoted 3 lines · [email protected] writes:

------------------------------------------------------
From: Waiman Long <[email protected]>
Subject: watchdog: Fix possible soft lockup warning at bootup

Completely empty changelog without any justification for this change.

Quoted 27 lines

---

 kernel/watchdog.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/watchdog.c renamed from kernel/watchdog.c~watchdog-fix-possible-soft-lockup-warning-at-bootup-v2 +1 -3
@@ -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);

_

Quoted 4 lines

Patches currently in -mm which might be from [email protected] are

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

Please drop both. The initial one just papers over timer interrupt loss and weakens debugging. That V2 thing is just fixing up the wreckage introduced in the initial one.

Thanks,

tglx

#2 lore raw
Quoted 7 lines · On Thu, 16 Jan 2020 12:55:49 +0100 Thomas Gleixner <[email protected]> wrote:
Quoted 3 lines · [email protected] writes:

------------------------------------------------------
From: Waiman Long <[email protected]>
Subject: watchdog: Fix possible soft lockup warning at bootup

Completely empty changelog without any justification for this change.

Well, this is the v1->v2 delta. It's removing an unnecessary change from the v1 patch. Normally that's covered in the main patch's changelog but removing an unneeded change isn't changeloggable.

Quoted 27 lines
Quoted 27 lines

---

 kernel/watchdog.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/watchdog.c renamed from kernel/watchdog.c~watchdog-fix-possible-soft-lockup-warning-at-bootup-v2 +1 -3
@@ -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);

_

Quoted 8 lines
Quoted 4 lines

Patches currently in -mm which might be from [email protected] are

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

Please drop both. The initial one just papers over timer interrupt loss and weakens debugging. That V2 thing is just fixing up the wreckage introduced in the initial one.

Not really - it's removing a change which was deemed unneeded.

But sure, dropped.