summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-11-12 15:07:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:02 +0900
commitbafe1e14403ad40714ffcfa1fb173b371cc87a1f (patch)
tree89f77e87cb2f8161f909aae650293bbddc2040e7
parent63d0f0a3c7e1281fd79268a8d988167eff607fb6 (diff)
downloadkernel-common-bafe1e14403ad40714ffcfa1fb173b371cc87a1f.tar.gz
kernel-common-bafe1e14403ad40714ffcfa1fb173b371cc87a1f.tar.bz2
kernel-common-bafe1e14403ad40714ffcfa1fb173b371cc87a1f.zip
ksm: remove redundant __GFP_ZERO from kcalloc
kcalloc returns zeroed memory. There's no need to use this flag. Signed-off-by: Joe Perches <joe@perches.com> Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/ksm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/ksm.c b/mm/ksm.c
index 0bea2b262a47..175fff79dc95 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2309,8 +2309,8 @@ static ssize_t merge_across_nodes_store(struct kobject *kobj,
* Allocate stable and unstable together:
* MAXSMP NODES_SHIFT 10 will use 16kB.
*/
- buf = kcalloc(nr_node_ids + nr_node_ids,
- sizeof(*buf), GFP_KERNEL | __GFP_ZERO);
+ buf = kcalloc(nr_node_ids + nr_node_ids, sizeof(*buf),
+ GFP_KERNEL);
/* Let us assume that RB_ROOT is NULL is zero */
if (!buf)
err = -ENOMEM;