diff --git a/[refs] b/[refs]
index 14555f36c953..5af0d93a70f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06f8d00e9eecb738c99b737ac38a585ea7583ad5
+refs/heads/master: 6bca67f951f80b9e61078f8cdf5fb7b3d9e51aa9
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
index c4a7ec31394c..2fe06ab5c547 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -580,7 +580,7 @@ static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize,
 	char __user *buf = ubuf;
 	int i, err;
 
-	cpu_tsc = kmalloc(NR_CPUS * sizeof(long), GFP_KERNEL);
+	cpu_tsc = kmalloc(nr_cpu_ids * sizeof(long), GFP_KERNEL);
 	if (!cpu_tsc)
 		return -ENOMEM;