From 9b7e16cb0884e0842fe703e6197fde888916587f Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 1 Nov 2010 18:52:05 +0100 Subject: [PATCH] --- yaml --- r: 221811 b: refs/heads/master c: 034c6efa4616e5ff6253549e973e7fef12899324 h: refs/heads/master i: 221809: 0139461eabe8b23da09da34feca8cd0791d6eb02 221807: 46e2819dfc8e2b8fb6b8a7eef58534fb125a5be8 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event_amd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 131a3117dd29..77aab0fb07e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eed01528a45dc4138e9a08064b4b6cc1a9426899 +refs/heads/master: 034c6efa4616e5ff6253549e973e7fef12899324 diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd.c b/trunk/arch/x86/kernel/cpu/perf_event_amd.c index 46d58448c3af..e421b8cd6944 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event_amd.c +++ b/trunk/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; /*