Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp736056ybz; Wed, 15 Apr 2020 17:50:50 -0700 (PDT) X-Google-Smtp-Source: APiQypIbcsAx3tEYcO9BrUfSI8tXZkILZYTk5bgojz3JeedC7oYBZ+c5/hchHeqpauj1Ub5WNjBB X-Received: by 2002:a50:f390:: with SMTP id g16mr2637913edm.211.1586998250182; Wed, 15 Apr 2020 17:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586998250; cv=none; d=google.com; s=arc-20160816; b=dg+GNmBU3CXRABO5g5fOzB54sqXubK9Dr49DXnz8/y6qeaAPMYGTObQ/FJu5Pgl3at KUa//YNjhHaDCVHh21drMvsuDs8Njilsbn6thGWb7yvcCThKKl9ADckJXN0R4KcOuvfG VbwD51+qMY8mWjV8DuG7kPGA19XYEt0pi/AcxoSwCQBVS3xp+PsxvMU2muM5HFMfMxc9 1u9xGBpmTImAbQrsQR041NLjxM9ev+g3d98F5ONgB76QmgiIDXtGjkJuPzELcdaeL7+0 3HXNkxEWz80B9NFJW1YHLGj1jAES8nSME4J/gMRSiKIdj4xIMsWTbIg1gz+TFuSTxbKz NX+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=tqT5F46IVEeG5JqPgqVcGC04L2Jj0WA+/igGIhytB4Y=; b=NhHH9zlPdClRMLtHsuu9rmrPQDjjGV3rIdTjLcJol4Efj4O0j5Vn77ACFhYLbq80Tx VUPWR2td+2cEGb5lKqdLGOuyno4jZ4yBDBe4K0Tosx+bOzkyf7ZPa8hBz8AtdyOEYqCt NRROKkj5lEcB3UUw5Pt7gdTX358/7ClNJrZlQddRUjO5tj1ovhnkLyd2CLVcIC3BKhgz hlwGlYkgouavdLRAcUgFrD1hhh0ZfTDHZJks1ATGVt5ONk/LTY8Kja3vsx37AK2uMKb8 ar9t4EZl2QRnISNbT+ApZf84gxsXoGpP1JpaGeczVkslK4DD/5/gw+WKq8JR6xWhPdEE T/Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d+MTIUhL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d14si2621279edv.332.2020.04.15.17.50.27; Wed, 15 Apr 2020 17:50:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d+MTIUhL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416639AbgDOSWt (ORCPT + 99 others); Wed, 15 Apr 2020 14:22:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:37454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2441378AbgDOSTx (ORCPT ); Wed, 15 Apr 2020 14:19:53 -0400 Received: from paulmck-ThinkPad-P72.home (50-39-105-78.bvtn.or.frontiernet.net [50.39.105.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AD37921835; Wed, 15 Apr 2020 18:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586974789; bh=1XnsCZM+pttPcms4B+LS2wz1W45AlBaSp+DmLTPoFXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d+MTIUhLV+e7ifBGL5oKiJ2946Nd8OGVabwc/tpIT2Dk7JVfzpxg+KfDYPbdGt8Ij RNSByyKcl43upuEWWHogmfaAsytFP1x3ihyRnWoXQ3234sLjIpRAdMgFCQh/NKx67O idJVdQL/brYE4cs3jFz/KouLQMiFn4fMmaofZ6go= From: paulmck@kernel.org To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org, "Paul E. McKenney" Subject: [PATCH v4 tip/core/rcu 18/38] rcu-tasks: Move #ifdef into tasks.h Date: Wed, 15 Apr 2020 11:19:21 -0700 Message-Id: <20200415181941.11653-18-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200415181856.GA11037@paulmck-ThinkPad-P72> References: <20200415181856.GA11037@paulmck-ThinkPad-P72> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Paul E. McKenney" This commit pushes the #ifdef CONFIG_TASKS_RCU_GENERIC from kernel/rcu/update.c to kernel/rcu/tasks.h in order to improve readability as more APIs are added. Signed-off-by: Paul E. McKenney --- kernel/rcu/tasks.h | 5 +++++ kernel/rcu/update.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/rcu/tasks.h b/kernel/rcu/tasks.h index 1484e8c..d65a97f 100644 --- a/kernel/rcu/tasks.h +++ b/kernel/rcu/tasks.h @@ -5,6 +5,7 @@ * Copyright (C) 2020 Paul E. McKenney */ +#ifdef CONFIG_TASKS_RCU_GENERIC //////////////////////////////////////////////////////////////////////// // @@ -980,3 +981,7 @@ core_initcall(rcu_spawn_tasks_trace_kthread); #else /* #ifdef CONFIG_TASKS_TRACE_RCU */ void exit_tasks_rcu_finish_trace(struct task_struct *t) { } #endif /* #else #ifdef CONFIG_TASKS_TRACE_RCU */ + +#else /* #ifdef CONFIG_TASKS_RCU_GENERIC */ +static inline void rcu_tasks_bootup_oddness(void) {} +#endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */ diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c index 30dce20..c579934 100644 --- a/kernel/rcu/update.c +++ b/kernel/rcu/update.c @@ -584,11 +584,7 @@ late_initcall(rcu_verify_early_boot_tests); void rcu_early_boot_tests(void) {} #endif /* CONFIG_PROVE_RCU */ -#ifdef CONFIG_TASKS_RCU_GENERIC #include "tasks.h" -#else /* #ifdef CONFIG_TASKS_RCU_GENERIC */ -static inline void rcu_tasks_bootup_oddness(void) {} -#endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */ #ifndef CONFIG_TINY_RCU -- 2.9.5