From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E601D14E2F2 for ; Sun, 14 Sep 2025 00:35:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757810144; cv=none; b=FUigy/XBvZKEjLLTu3FqZ5fZb2op0xuW8ZFyPGFw6VAO5M0sNmlxShlsNeIAiRMCCVUvGekv6BahpPqBKHZiwEg+Ctk5kiIorylsqqc432jgZ2Nqn2ivTYDN50o0Dh/lysDKm53GulsZS7Pa8zo7Vma3d+vyNxxTmZLOgXCIeRA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757810144; c=relaxed/simple; bh=t6k+0/sAf0pQACE2vfJgCfNisuBvUkMmFYhiLi9b+dw=; h=Date:To:From:Subject:Message-Id; b=SXxSuPML2wzKHaM1cRfYy3GsOLNFwNXmNKxirVNj+LtYa26TpMGPhpTHprss6arTTbebYwkjqKiwYqlJQffHDq2mCDr7EKnZBzLJpge2SRZZ/LmTWQ7NVT3Al17RnfnS4HKHqiP9T8vgCCMeacOPyIMmgQ0Q62J/RidgzJ8hlPo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=jhm8DgVl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="jhm8DgVl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65DECC4CEEB; Sun, 14 Sep 2025 00:35:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1757810143; bh=t6k+0/sAf0pQACE2vfJgCfNisuBvUkMmFYhiLi9b+dw=; h=Date:To:From:Subject:From; b=jhm8DgVl2o1hi8I4g2KIpxQY3qhrOvFQhbiEzW2yqyMIRkQy6SSOF4XiNTeMSVyT/ oIsiWKuC6LIF/0woKqg35lvT77REIPh/I/Ez2AenkrO6zC0ZFa4L8SNTmTw4TKvIcW qeaUOOiwgPCWKoSQUWwd+A8Myi7VfXpwFEi0AI2c= Date: Sat, 13 Sep 2025 17:35:42 -0700 To: mm-commits@vger.kernel.org,yury.norov@gmail.com,yangyicong@hisilicon.com,ville.syrjala@linux.intel.com,vgoyal@redhat.com,tzimmermann@suse.de,tony.luck@intel.com,tj@kernel.org,thorsten.blum@linux.dev,tglx@linutronix.de,sohil.mehta@intel.com,senozhatsky@chromium.org,rostedt@goodmis.org,qianqiang.liu@163.com,pmladek@suse.com,oushixiong@kylinos.cn,namcao@linutronix.de,mingo@kernel.org,max.kellermann@ionos.com,luogengkun@huaweicloud.com,lihuafei1@huawei.com,kees@kernel.org,Jonathan.Cameron@huawei.com,john.ogness@linutronix.de,joel.granados@kernel.org,jgg@ziepe.ca,gpiccoli@igalia.com,dyoung@redhat.com,djwong@kernel.org,dianders@chromium.org,deller@gmx.de,cuiyunhui@bytedance.com,bhe@redhat.com,anna.schumaker@oracle.com,wangjinchao600@gmail.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] printk-nbcon-use-panic_on_this_cpu-helper.patch removed from -mm tree Message-Id: <20250914003543.65DECC4CEEB@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: printk/nbcon: use panic_on_this_cpu() helper has been removed from the -mm tree. Its filename was printk-nbcon-use-panic_on_this_cpu-helper.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: Jinchao Wang Subject: printk/nbcon: use panic_on_this_cpu() helper Date: Mon, 25 Aug 2025 10:29:34 +0800 nbcon_context_try_acquire() compared panic_cpu directly with smp_processor_id(). This open-coded check is now provided by panic_on_this_cpu(). Switch to panic_on_this_cpu() to simplify the code and improve readability. Link: https://lkml.kernel.org/r/20250825022947.1596226-7-wangjinchao600@gmail.com Signed-off-by: Jinchao Wang Cc: Anna Schumaker Cc: Baoquan He Cc: "Darrick J. Wong" Cc: Dave Young Cc: Doug Anderson Cc: "Guilherme G. Piccoli" Cc: Helge Deller Cc: Ingo Molnar Cc: Jason Gunthorpe Cc: Joanthan Cameron Cc: Joel Granados Cc: John Ogness Cc: Kees Cook Cc: Li Huafei Cc: "Luck, Tony" Cc: Luo Gengkun Cc: Max Kellermann Cc: Nam Cao Cc: oushixiong Cc: Petr Mladek Cc: Qianqiang Liu Cc: Sergey Senozhatsky Cc: Sohil Mehta Cc: Steven Rostedt Cc: Tejun Heo Cc: Thomas Gleinxer Cc: Thomas Zimemrmann Cc: Thorsten Blum Cc: Ville Syrjala Cc: Vivek Goyal Cc: Yicong Yang Cc: Yunhui Cui Cc: Yury Norov (NVIDIA) Signed-off-by: Andrew Morton --- kernel/printk/nbcon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/kernel/printk/nbcon.c~printk-nbcon-use-panic_on_this_cpu-helper +++ a/kernel/printk/nbcon.c @@ -2,6 +2,7 @@ // Copyright (C) 2022 Linutronix GmbH, John Ogness // Copyright (C) 2022 Intel, Thomas Gleixner +#include "linux/panic.h" #include #include #include @@ -589,7 +590,6 @@ static struct printk_buffers panic_nbcon */ static bool nbcon_context_try_acquire(struct nbcon_context *ctxt, bool is_reacquire) { - unsigned int cpu = smp_processor_id(); struct console *con = ctxt->console; struct nbcon_state cur; int err; @@ -614,7 +614,7 @@ out: /* Acquire succeeded. */ /* Assign the appropriate buffer for this context. */ - if (atomic_read(&panic_cpu) == cpu) + if (panic_on_this_cpu()) ctxt->pbufs = &panic_nbcon_pbufs; else ctxt->pbufs = con->pbufs; _ Patches currently in -mm which might be from wangjinchao600@gmail.com are