From nobody Mon Feb 9 18:43:18 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDB8F2063FC for ; Mon, 3 Feb 2025 14:16:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738592211; cv=none; b=Vn94y+jExD7liCRtTiKvN438stXWXfOaKZgwG/s3IjhHNBpoR5Ch9pMoykHarPKf2Uvn1A+YM76TJ5WgZ1mguRJ7q2SjWA2Z2YSLjiRpvbK7D2BoaeU2E+uboyquZ8MMAgP+aL/5GC5S3GOra+yc1Lla2Z9UBJdYJOQpDCSy6ok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738592211; c=relaxed/simple; bh=mR6vPOjdkBTEdRSlAl2s/rFalP/2IlJiRUYhKvRs1Wk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pL5xIhkTWx8ZeqLiYLGqKgV+2c4W+PFv/pmI0XXfnR/P09LP6uH9fBtMmRW1n2zh0V8lWMiPIFilyYVMKQdIiasLgIsvZ6D1kc1IDR+ItIDSvUqA1JSEytv48ANEX/k4giGiPDuDxio/gqqTiRPJjYPcGfLda2oxv1vNbeqZG3k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=fa2pGKEz; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=2ggrNndh; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fa2pGKEz"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="2ggrNndh" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1738592208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m0V5ulaONnLToG07tiQ1kzrRUASrctk1BlR8nwnpSIU=; b=fa2pGKEzmwGixw0PPg9eEw1rs7GM/afNRYkoYQMeft0a4FBTh8ofpR751iqqQBlV8EJSDL FMhnnHlF5Utbdv3j+OYsl4pWxENAGL06nsg0SpnEhoYiI84T7hEkMP3AdPVadU3NCvK/vA lCf2FbWI+RbyRR9lgk8VpgnvVgo2sC7HTKZh7VyGzD3PUF+YzSNBZXAdxdVIKwKdZC4l2U DCFrlXlxWfzYcCqneUCloNdXLW+UmhPJ1kbYJBC/+aliOykZL4EGARtsibtfpFGJB6kFFG tZLe94y1THHStfqoptnOCTtzqY0/KagL0OvAysrMEIph8CCMGdnTl2bAKFKWuA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1738592208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m0V5ulaONnLToG07tiQ1kzrRUASrctk1BlR8nwnpSIU=; b=2ggrNndhlZgjqGyOaTjuqRZKvC5AXFzUlrEvERzBH0iQrlO8Ag2yQhE9FDQysMJLYhAQfx o7YQcDjrkYlr8hBw== To: linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev Cc: Ben Segall , Catalin Marinas , Dietmar Eggemann , Ingo Molnar , Juri Lelli , Mel Gorman , Peter Zijlstra , Shrikanth Hegde , Steven Rostedt , Thomas Gleixner , Valentin Schneider , Vincent Guittot , Will Deacon , Sebastian Andrzej Siewior , Chris Zankel , Max Filippov Subject: [PATCH v2 8/9] xtensa: Use preempt_model_str(). Date: Mon, 3 Feb 2025 15:16:31 +0100 Message-ID: <20250203141632.440554-9-bigeasy@linutronix.de> In-Reply-To: <20250203141632.440554-1-bigeasy@linutronix.de> References: <20250203141632.440554-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use preempt_model_str() instead of manually conducting the preemption model. Cc: Chris Zankel Cc: Max Filippov Signed-off-by: Sebastian Andrzej Siewior Acked-by: Max Filippov --- arch/xtensa/kernel/traps.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index 38092d21acf8e..a7b1e4ad112e8 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c @@ -629,15 +629,11 @@ DEFINE_SPINLOCK(die_lock); void __noreturn die(const char * str, struct pt_regs * regs, long err) { static int die_counter; - const char *pr =3D ""; - - if (IS_ENABLED(CONFIG_PREEMPTION)) - pr =3D IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT"; =20 console_verbose(); spin_lock_irq(&die_lock); =20 - pr_info("%s: sig: %ld [#%d]%s\n", str, err, ++die_counter, pr); + pr_info("%s: sig: %ld [#%d] %s\n", str, err, ++die_counter, preempt_model= _str()); show_regs(regs); if (!user_mode(regs)) show_stack(NULL, (unsigned long *)regs->areg[1], KERN_INFO); --=20 2.47.2