2014-04-26 08:48:33

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 1/1] mm/memcontrol.c: remove NULL assignment on static

static values are automatically initialized to NULL

Cc: Johannes Weiner <[email protected]>
Cc: Andrew Morton <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
mm/memcontrol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 29501f0..6e38542 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
@@ -3097,7 +3097,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
--
1.8.4.5