aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-04 16:08:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 16:54:04 -0700
commitada4ba591472f511ad56dd0075c457295c3ca317 (patch)
tree986759bea277da6e04caa8fd3230ea5a1bb40236
parentmm: shrinker: add nid to tracepoint output (diff)
downloadlinux-dev-ada4ba591472f511ad56dd0075c457295c3ca317.tar.xz
linux-dev-ada4ba591472f511ad56dd0075c457295c3ca317.zip
mm/memcontrol.c: remove NULL assignment on static
static values are automatically initialized to NULL Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 14326935800d..03d76628fd9d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -80,7 +80,7 @@ int do_swap_account __read_mostly;
#ifdef CONFIG_MEMCG_SWAP_ENABLED
static int really_do_swap_account __initdata = 1;
#else
-static int really_do_swap_account __initdata = 0;
+static int really_do_swap_account __initdata;
#endif
#else
@@ -3110,7 +3110,7 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups)
char *memcg_create_cache_name(struct mem_cgroup *memcg,
struct kmem_cache *root_cache)
{
- static char *buf = NULL;
+ static char *buf;
/*
* We need a mutex here to protect the shared buffer. Since this is