From ada4ba591472f511ad56dd0075c457295c3ca317 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Wed, 4 Jun 2014 16:08:08 -0700 Subject: [PATCH] mm/memcontrol.c: remove NULL assignment on static static values are automatically initialized to NULL Signed-off-by: Fabian Frederick Cc: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1432693..03d7662 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 -- 2.7.4