| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20151210205011.GA4967@cmpxchg.org> Date: Thu, 10 Dec 2015 15:50:11 -0500 From: Johannes Weiner <hannes@...xchg.org> To: Andrew Morton <akpm@...ux-foundation.org> Cc: Michal Hocko <mhocko@...e.cz>, Vladimir Davydov <vdavydov@...tuozzo.com>, linux-mm@...ck.org, cgroups@...r.kernel.org, linux-kernel@...r.kernel.org, kernel-team@...com, Arnd Bergmann <arnd@...db.de> Subject: Re: [PATCH 6/8 v2] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG Narf. Almost there... >From db4522b2b3e6ca8ce5f6e673948772bcd8fdd298 Mon Sep 17 00:00:00 2001 From: Johannes Weiner <hannes@...xchg.org> Date: Thu, 10 Dec 2015 15:42:54 -0500 Subject: [PATCH] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG fix Signed-off-by: Johannes Weiner <hannes@...xchg.org> --- include/linux/slab.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 3ffee74..3627d5c 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -86,7 +86,7 @@ #else # define SLAB_FAILSLAB 0x00000000UL #endif -#ifdef CONFIG_MEMCG_KMEM +#if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB) # define SLAB_ACCOUNT 0x04000000UL /* Account to memcg */ #else # define SLAB_ACCOUNT 0x00000000UL -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists