]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
mm: memcontrol: avoid unused function warning
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Aug 2016 22:17:08 +0000 (15:17 -0700)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Thu, 6 Apr 2017 08:22:58 +0000 (09:22 +0100)
commit1a068b0d0d09c28b31f3a6179d752eefb84bebb5
tree6b61fb1fd60239063d82ab556457877a9ce92627
parent8e413941a21649b9b4960d3c2e022d1cbd3a8134
mm: memcontrol: avoid unused function warning

BugLink: http://bugs.launchpad.net/bugs/1674292
commit 358c07fcc3b60ab08d77f1684de8bd81bcf49a1a upstream.

A bugfix in v4.8-rc2 introduced a harmless warning when
CONFIG_MEMCG_SWAP is disabled but CONFIG_MEMCG is enabled:

  mm/memcontrol.c:4085:27: error: 'mem_cgroup_id_get_online' defined but not used [-Werror=unused-function]
   static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg)

This moves the function inside of the #ifdef block that hides the
calling function, to avoid the warning.

Fixes: 1f47b61fb407 ("mm: memcontrol: fix swap counter leak on swapout from offline cgroup")
Link: http://lkml.kernel.org/r/20160824113733.2776701-1-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
mm/memcontrol.c