Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bfb7e6b authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar
Browse files

perf: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node() 



Use the convenience function instead of __GFP_ZERO.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/f58599ae1a8d7b32d37e9cf283e95fba6452f7f6.1377809875.git.joe@perches.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 274481de

arch/x86/kernel/cpu/perf_event_amd.c

+1 −2
Original line number Diff line number Diff line
@@ -347,8 +347,7 @@ static struct amd_nb *amd_alloc_nb(int cpu) 
	struct amd_nb *nb;

	int i;



	nb = kmalloc_node(sizeof(struct amd_nb), GFP_KERNEL | __GFP_ZERO,

			  cpu_to_node(cpu));

	nb = kzalloc_node(sizeof(struct amd_nb), GFP_KERNEL, cpu_to_node(cpu));

	if (!nb)

		return NULL;

arch/x86/kernel/cpu/perf_event_intel_ds.c

+3 −3
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int alloc_pebs_buffer(int cpu) 
	if (!x86_pmu.pebs)

		return 0;



	buffer = kmalloc_node(PEBS_BUFFER_SIZE, GFP_KERNEL | __GFP_ZERO, node);

	buffer = kzalloc_node(PEBS_BUFFER_SIZE, GFP_KERNEL, node);

	if (unlikely(!buffer))

		return -ENOMEM;
@@ -262,7 +262,7 @@ static int alloc_bts_buffer(int cpu) 
	if (!x86_pmu.bts)

		return 0;



	buffer = kmalloc_node(BTS_BUFFER_SIZE, GFP_KERNEL | __GFP_ZERO, node);

	buffer = kzalloc_node(BTS_BUFFER_SIZE, GFP_KERNEL, node);

	if (unlikely(!buffer))

		return -ENOMEM;
@@ -295,7 +295,7 @@ static int alloc_ds_buffer(int cpu) 
	int node = cpu_to_node(cpu);

	struct debug_store *ds;



	ds = kmalloc_node(sizeof(*ds), GFP_KERNEL | __GFP_ZERO, node);

	ds = kzalloc_node(sizeof(*ds), GFP_KERNEL, node);

	if (unlikely(!ds))

		return -ENOMEM;

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -2713,7 +2713,7 @@ struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cp 


	size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);



	box = kmalloc_node(size, GFP_KERNEL | __GFP_ZERO, cpu_to_node(cpu));

	box = kzalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));

	if (!box)

		return NULL;