From 0d3a6f3a615411c85065734ee5ea605df85d3401 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann3@amd.com>
Date: Fri, 27 Aug 2010 11:20:07 +0200
Subject: [PATCH] --- yaml --- r: 210371 b: refs/heads/master c:
 1389298f7d14f179c2fa4b4b343079bd56082c70 h: refs/heads/master i:   210369:
 ce6fefda256d2b46d5d5ac27079baad8a86f4772   210367:
 66b40c41df84fb34774cb68bc3fd8b4301a4516d v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 57d158f3c964..10475fb1f816 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29bc17ecb856ffb2b47c7009a71971c6f9334205
+refs/heads/master: 1389298f7d14f179c2fa4b4b343079bd56082c70
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 224392d8fe8c..5e975298fa81 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -530,7 +530,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 		err = -ENOMEM;
 		goto out;
 	}
-	if (!alloc_cpumask_var(&b->cpus, GFP_KERNEL)) {
+	if (!zalloc_cpumask_var(&b->cpus, GFP_KERNEL)) {
 		kfree(b);
 		err = -ENOMEM;
 		goto out;
@@ -543,7 +543,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 #ifndef CONFIG_SMP
 	cpumask_setall(b->cpus);
 #else
-	cpumask_copy(b->cpus, c->llc_shared_map);
+	cpumask_set_cpu(cpu, b->cpus);
 #endif
 
 	per_cpu(threshold_banks, cpu)[bank] = b;