Skip to contentSkip to conversation

watchdog-hardlockup-dont-use-raw_cpu_ptr-in-watchdog_hardlockup_kick.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jun 19, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: watchdog/hardlockup: don't use raw_cpu_ptr() in watchdog_hardlockup_kick()
has been removed from the -mm tree. Its filename was
watchdog-hardlockup-dont-use-raw_cpu_ptr-in-watchdog_hardlockup_kick.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: watchdog/hardlockup: don't use raw_cpu_ptr() in watchdog_hardlockup_kick()
Date: Fri, 26 May 2023 18:41:33 -0700

In the patch ("watchdog/hardlockup: add a "cpu" param to watchdog_hardlockup_check()") there was no reason to use raw_cpu_ptr(). Using this_cpu_ptr() works fine.

---

 kernel/watchdog.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/watchdog.c renamed from kernel/watchdog.c~watchdog-hardlockup-dont-use-raw_cpu_ptr-in-watchdog_hardlockup_kick +1 -1
@@ -133,7 +133,7 @@ static bool is_hardlockup(unsigned int c
 
 static unsigned long watchdog_hardlockup_kick(void)
 {
-	return atomic_inc_return(raw_cpu_ptr(&hrtimer_interrupts));
+	return atomic_inc_return(this_cpu_ptr(&hrtimer_interrupts));
 }
 
 void watchdog_hardlockup_check(unsigned int cpu, struct pt_regs *regs)

_

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