X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=mm%2Fpercpu.c;fp=mm%2Fpercpu.c;h=28e07ede46f6649eb3e69368d8d09d806bf09d43;hp=acd78da0493b96d229ae065ec0e24dd61f82c8ce;hb=f7a449f779608efe1941a0e0c4bd7b5f57000be7;hpb=b4fb12e6c74791ac4c5c98b845628c576366b889 diff --git a/mm/percpu.c b/mm/percpu.c index acd78da0493b..28e07ede46f6 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1625,7 +1625,7 @@ static bool pcpu_memcg_pre_alloc_hook(size_t size, gfp_t gfp, { struct obj_cgroup *objcg; - if (!memcg_kmem_enabled() || !(gfp & __GFP_ACCOUNT)) + if (!memcg_kmem_online() || !(gfp & __GFP_ACCOUNT)) return true; objcg = get_obj_cgroup_from_current();