[folded-merged] panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic-v2.patch removed from -mm tree

[folded-merged] panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic-v2.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic-v2
has been removed from the -mm tree.  Its filename was
     panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic-v2.patch

This patch was dropped because it was folded into panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic.patch

------------------------------------------------------
From: Uros Bizjak <ubizjak@gmail.com>
Subject: panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic-v2
Date: Wed, 6 Sep 2023 21:11:28 +0200

clean up if/else block

Link: https://lkml.kernel.org/r/20230906191200.68707-1-ubizjak@gmail.com
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/panic.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/kernel/panic.c~panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic-v2
+++ a/kernel/panic.c
@@ -321,9 +321,9 @@ void panic(const char *fmt, ...)
 	this_cpu = raw_smp_processor_id();
 
 	/* atomic_try_cmpxchg updates old_cpu on failure */
-	if (atomic_try_cmpxchg(&panic_cpu, &old_cpu, this_cpu))
-		;
-	else if (old_cpu != this_cpu)
+	if (atomic_try_cmpxchg(&panic_cpu, &old_cpu, this_cpu)) {
+		/* go ahead */
+	} else if (old_cpu != this_cpu)
 		panic_smp_self_stop();
 
 	console_verbose();
_

Patches currently in -mm which might be from ubizjak@gmail.com are

panic-use-atomic_try_cmpxchg-in-panic-and-nmi_panic.patch