| From arnd@arndb.de Sun Sep 25 15:19:10 2016 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Sat, 24 Sep 2016 23:29:51 +0200 |
| Subject: Fix build warning in kernel/cpuset.c |
| To: linaro-kernel@lists.linaro.org |
| Cc: Build bot for Mark Brown <broonie@kernel.org>, kernel-build-reports@lists.linaro.org, stable@vger.kernel.org |
| Message-ID: <2634456.rLc29tnUR8@wuerfel> |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| |
| > 2 ../kernel/cpuset.c:2101:11: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] |
| > 1 ../kernel/cpuset.c:2101:2: warning: initialization from incompatible pointer type |
| > 1 ../kernel/cpuset.c:2101:2: warning: (near initialization for 'cpuset_cgrp_subsys.fork') |
| |
| This got introduced by 06ec7a1d7646 ("cpuset: make sure new tasks |
| conform to the current config of the cpuset"). In the upstream |
| kernel, the function prototype was changed as of b53202e63089 |
| ("cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friends"). |
| |
| That patch is not suitable for stable kernels, and fortunately |
| the warning seems harmless as the prototypes only differ in the |
| second argument that is unused. Adding that argument gets rid |
| of the warning: |
| |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/cpuset.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/kernel/cpuset.c |
| +++ b/kernel/cpuset.c |
| @@ -2079,7 +2079,7 @@ static void cpuset_bind(struct cgroup_su |
| * which could have been changed by cpuset just after it inherits the |
| * state from the parent and before it sits on the cgroup's task list. |
| */ |
| -void cpuset_fork(struct task_struct *task) |
| +void cpuset_fork(struct task_struct *task, void *priv) |
| { |
| if (task_css_is_root(task, cpuset_cgrp_id)) |
| return; |
