[PATCH v2 5/5] cgroup: Make builtin vs. module build ifdefs consistent
DORMANTno replies
From: Daniel Wagner <hidden>
Date: 2012-07-11 09:35:41
Also in:
cgroups
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Daniel Wagner <redacted> The header file is using IS_MODULE and IS_BUILTIN macros. So let's use them in the source file too. Signed-off-by: Daniel Wagner <redacted> Cc: Neil Horman <redacted> Cc: John Fastabend <redacted> Cc: Tejun Heo <redacted> Cc: Li Zefan <redacted> Cc: "David S. Miller" <redacted> --- net/core/netprio_cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index 3e953ea..2707948 100644
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c@@ -252,7 +252,7 @@ struct cgroup_subsys net_prio_subsys = { .name = "net_prio", .create = cgrp_create, .destroy = cgrp_destroy, -#ifdef CONFIG_NETPRIO_CGROUP +#if IS_BUILTIN(CONFIG_NETPRIO_CGROUP) .subsys_id = net_prio_subsys_id, #endif .base_cftypes = ss_files,
@@ -292,7 +292,7 @@ static int __init init_cgroup_netprio(void) ret = cgroup_load_subsys(&net_prio_subsys); if (ret) goto out; -#ifndef CONFIG_NETPRIO_CGROUP +#if IS_MODULE(CONFIG_NETPRIO_CGROUP) smp_wmb(); net_prio_subsys_id = net_prio_subsys.subsys_id; #endif
@@ -312,7 +312,7 @@ static void __exit exit_cgroup_netprio(void) cgroup_unload_subsys(&net_prio_subsys); -#ifndef CONFIG_NETPRIO_CGROUP +#if IS_MODULE(CONFIG_NETPRIO_CGROUP) net_prio_subsys_id = -1; synchronize_rcu(); #endif
--
1.7.11.1.165.g299666c