Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp30927ybb; Fri, 27 Mar 2020 15:25:38 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu9/PePGWICFcbg+ukJ3xcm7Syi5gvwn/sMwyFk9vPFJHn77jYtze8pIBjWGE6M057qJUm3 X-Received: by 2002:a9d:8f3:: with SMTP id 106mr471296otf.328.1585347938044; Fri, 27 Mar 2020 15:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585347938; cv=none; d=google.com; s=arc-20160816; b=BuQ6Dc6uicg7Zgxk+y5x29ikxLfaOkYBxTpNyVh2W6/2nmCeRoKwmHsaG0kvG+L0bd V3jVgR8hj0/xv3B263TAVvYIIJR2YeEtF8sGrhB9ZBUDSu62INTpLFoH06oklz/2BoJu +2PoxycXIFOaweAAfzByE/vtiyZwgfkyzzzQx1xdo/V9SKKRYZt6AbLGFMDLnvZZwAEv Tf8YSyUyig7YdtSENoDhY1rm3cOMgTtme81zPYpsON0CZfwnQIVuKtHia7bV0h84+82y PsVqSMafR2o3MgVGpQd/xf0JMBf55igI2eUgOAPq/nsZfL6ZTKDhhn13BQFJywNBOi1R rhhQ== 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=ZZrVW6eSDe5EPbZynux+EzF6spz1IkZr7D+citxQCJg=; b=vsf0YiQl6ca62/rps51dZ6fdeTO+2zlYL9NtFhJIcjbt1ohn4GrRgbTnzqgpE0Z50s gXxpEb6D9HTspjdme3ElLpyHJ6LNZUiWRPaPJsmUla+Ba7ajn7xLQrI+ObfmcQuEYzJc adjxPVrpPq2jEnjGHiRKV9blwMkRYQsKd9Ch5wPSu3CuPw2VMv982fkm1XDe7wQc4ZTn dPSt6nu5rmG9rtDCGT9epQLZY52VuVQdsodgD7/ttT8Y0L0+LgnFBhICsFguQBaAfhAT 8R2NRWIS41rOwkaarK68zAQrti0Ntb84VDUBL4H4EAgOmo8OBUCT7/dki4rnsdUzlKNg aMxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Muyr7dLy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id x9si2887884oia.194.2020.03.27.15.25.25; Fri, 27 Mar 2020 15:25:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Muyr7dLy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1727837AbgC0WZF (ORCPT + 99 others); Fri, 27 Mar 2020 18:25:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:42870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727826AbgC0WZE (ORCPT ); Fri, 27 Mar 2020 18:25:04 -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 DB367212CC; Fri, 27 Mar 2020 22:25:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585347904; bh=t2YKm8bgTn1HeOwZI5TULk2Ri2OZOPNEnL8cEhKP9zY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Muyr7dLy9Hc6fhxgL51My65Ccoo/mimhOlY6WJVTv/HKF7C814ZX0mKunEkurl+My tQXf7OuwHjD7dlhItMMtI7arDTJhzOZ7JLLZaNa9EUMzdy+9MXw6ZgLiMEywNhyGuu UGstMP4ufIt0Onphrneg+bAsnTJaW9Ag3BTzrqu8= 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 v3 tip/core/rcu 17/34] rcu-tasks: Move #ifdef into tasks.h Date: Fri, 27 Mar 2020 15:24:39 -0700 Message-Id: <20200327222456.12470-17-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200327222346.GA12082@paulmck-ThinkPad-P72> References: <20200327222346.GA12082@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 fc7f116..b52a640 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 16058a5..0fb2a9e 100644 --- a/kernel/rcu/update.c +++ b/kernel/rcu/update.c @@ -559,11 +559,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