From 7b40c929283167928662162443541867ac247583 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 1 May 2017 15:24:14 -0400 Subject: [PATCH] cgroup: mark cgroup_get() with __maybe_unused commit 310b4816a5d8082416b4ab83e5a7b3cb92883a4d upstream. a590b90d472f ("cgroup: fix spurious warnings on cgroup_is_dead() from cgroup_sk_alloc()") converted most cgroup_get() usages to cgroup_get_live() leaving cgroup_sk_alloc() the sole user of cgroup_get(). When !CONFIG_SOCK_CGROUP_DATA, this ends up triggering unused warning for cgroup_get(). Silence the warning by adding __maybe_unused to cgroup_get(). Reported-by: Stephen Rothwell Link: http://lkml.kernel.org/r/20170501145340.17e8ef86@canb.auug.org.au Signed-off-by: Tejun Heo [sw0312.kim: backport from mainline to fix build warning caused by the backported commite 54215a9bc4d ("cgroup_get() expected ...") in rpi-4.9.y] Signed-off-by: Seung-Woo Kim Change-Id: Ib70e3d4401f9e691940168ac7c4d819ab206c447 --- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 84f45a33d69f..0272d305a7ce 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -487,7 +487,7 @@ static inline bool cgroup_is_dead(const struct cgroup *cgrp) return !(cgrp->self.flags & CSS_ONLINE); } -static void cgroup_get(struct cgroup *cgrp) +static void __maybe_unused cgroup_get(struct cgroup *cgrp) { css_get(&cgrp->self); } -- 2.34.1