diff --git a/[refs] b/[refs] index ae19b66fb919..68685f282489 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688 +refs/heads/master: 82b3f2a7171731cce62f25058d25afb91a14710c diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 556859fec4ef..6728a7ae6f2d 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -776,7 +776,8 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) /* threshold event is triggered in finer grain than soft limit */ if (unlikely(mem_cgroup_event_ratelimit(memcg, MEM_CGROUP_TARGET_THRESH))) { - bool do_softlimit, do_numainfo; + bool do_softlimit; + bool do_numainfo __maybe_unused; do_softlimit = mem_cgroup_event_ratelimit(memcg, MEM_CGROUP_TARGET_SOFTLIMIT);