From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 1 Nov 2010 17:52:05 +0000 (+0100)
Subject: perf, amd: Use kmalloc_node(,__GFP_ZERO) for northbridge structure allocation
X-Git-Tag: Ubuntu-5.10.0-12.13~26486^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=034c6efa4616e5ff6253549e973e7fef12899324;p=mirror_ubuntu-hirsute-kernel.git

perf, amd: Use kmalloc_node(,__GFP_ZERO) for northbridge structure allocation

Jasper suggested we use the zeroing capability of the allocators
instead of calling memset ourselves. Add node affinity while we're at
it.

Reported-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/kernel/cpu/perf_event_amd.c
index 46d58448c3af..e421b8cd6944 100644
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/kernel/cpu/perf_event_amd.c
@@ -280,11 +280,11 @@ static struct amd_nb *amd_alloc_nb(int cpu, int nb_id)
 	struct amd_nb *nb;
 	int i;
 
-	nb = kmalloc(sizeof(struct amd_nb), GFP_KERNEL);
+	nb = kmalloc_node(sizeof(struct amd_nb), GFP_KERNEL | __GFP_ZERO,
+			  cpu_to_node(cpu));
 	if (!nb)
 		return NULL;
 
-	memset(nb, 0, sizeof(*nb));
 	nb->nb_id = nb_id;
 
 	/*