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 0DB4D2F1CE2; Mon, 5 May 2025 23:12:47 +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=1746486767; cv=none; b=komFCKkTA2Lat7MxYwavRyxUlkyoiw+a/2bEubo0JQ8yt3KzLur+PgU89Ew3FWhX3yYH3PZcMmYlke6cGqsvHbWE+HRbkTVi5BvJxkobyLcHexckoBCkgcp50E/VP5lTvYQMwcx8rEPxqTVJN99V4sKRsIxljPf9dAUn0CWfwb0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486767; c=relaxed/simple; bh=CJ7mdf4vRbTYoLfPVW/MpaXB5BFerskzFGtYZi0NiU4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nH5zjy7cGwyGNiqUReh7ePlHcpBBrreo0KT80aZmiHmXtQ0BaHPZvm7a2yQUzmnvFZ72NBKLoHrn+DyNa9p6ApBRH77QuLwk1wS1y11e51YtiGh4BN9hwG+kUljU1WCZ56nwld0KzMDv74K5sHEAPT5yvcpf29DMT/kVQm9Io+o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J+EbGQbH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="J+EbGQbH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85142C4CEE4; Mon, 5 May 2025 23:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486766; bh=CJ7mdf4vRbTYoLfPVW/MpaXB5BFerskzFGtYZi0NiU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J+EbGQbHZz6M+EevWUBBJ5uLAc52mFoXfJtxv7ziawoTlqSAl9+5nv9dtXC6U4gZY Chc2g2JGDndcKskBVXpfAzmh3GblCORKLM+j5w93oK0fH8DU+3d6ZDKFFeuxHQRM9e GmucS0UUOATRY20AF4Ye20UZ/kQ4HeiM4lZNBgc+6L+O5lPqYzrKk7yinQvt8JQknK HrKyQ2Bxrpypkf/aRiDsjf8XpxJAWWnBsPR/vEI9j+NqyXxJqSZWz4mYofRT5Blr19 nYlf6AOQwAYceFknidoIXC8bocR0ergrgMbLVIEkejZrILOJWBj38m6K0U5nsYtkaa 1FeAwAjdpeG5w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ankur Arora , "Paul E . McKenney" , Frederic Weisbecker , Sebastian Andrzej Siewior , Boqun Feng , Sasha Levin , neeraj.upadhyay@kernel.org, joel@joelfernandes.org, josh@joshtriplett.org, urezki@gmail.com, rcu@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 192/212] rcu: fix header guard for rcu_all_qs() Date: Mon, 5 May 2025 19:06:04 -0400 Message-Id: <20250505230624.2692522-192-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.136 Content-Transfer-Encoding: 8bit From: Ankur Arora [ Upstream commit ad6b5b73ff565e88aca7a7d1286788d80c97ba71 ] rcu_all_qs() is defined for !CONFIG_PREEMPT_RCU but the declaration is conditioned on CONFIG_PREEMPTION. With CONFIG_PREEMPT_LAZY, CONFIG_PREEMPTION=y does not imply CONFIG_PREEMPT_RCU=y. Decouple the two. Cc: Paul E. McKenney Reviewed-by: Frederic Weisbecker Reviewed-by: Sebastian Andrzej Siewior Signed-off-by: Ankur Arora Signed-off-by: Paul E. McKenney Signed-off-by: Boqun Feng Signed-off-by: Sasha Levin --- include/linux/rcutree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h index 5efb51486e8af..54483d5e6f918 100644 --- a/include/linux/rcutree.h +++ b/include/linux/rcutree.h @@ -105,7 +105,7 @@ extern int rcu_scheduler_active; void rcu_end_inkernel_boot(void); bool rcu_inkernel_boot_has_ended(void); bool rcu_is_watching(void); -#ifndef CONFIG_PREEMPTION +#ifndef CONFIG_PREEMPT_RCU void rcu_all_qs(void); #endif -- 2.39.5